summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell2007-10-11 06:48:24 +0200
committerPaul Mackerras2007-10-11 12:40:44 +0200
commitb707f517d2c72c6b340ba762ed8a7de2b22935e9 (patch)
tree1826a266e81c5cc871ff78712a73d1f3c7affed7
parent[POWERPC] Platforms shouldn't mess with ROOT_DEV (diff)
downloadkernel-qcow2-linux-b707f517d2c72c6b340ba762ed8a7de2b22935e9.tar.gz
kernel-qcow2-linux-b707f517d2c72c6b340ba762ed8a7de2b22935e9.tar.xz
kernel-qcow2-linux-b707f517d2c72c6b340ba762ed8a7de2b22935e9.zip
[POWERPC] Clean up vio.h
Remove vio_dma_ops declaration (since it no longer exists) and some unused fields from struct vio_driver. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/vio.c11
-rw-r--r--include/asm-powerpc/vio.h5
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 1d7b272b3737..fd631d4d1602 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -168,16 +168,6 @@ static int vio_bus_remove(struct device *dev)
return 1;
}
-/* convert from struct device to struct vio_dev and pass to driver. */
-static void vio_bus_shutdown(struct device *dev)
-{
- struct vio_dev *viodev = to_vio_dev(dev);
- struct vio_driver *viodrv = to_vio_driver(dev->driver);
-
- if (dev->driver && viodrv->shutdown)
- viodrv->shutdown(viodev);
-}
-
/**
* vio_register_driver: - Register a new vio driver
* @drv: The vio_driver structure to be registered.
@@ -397,7 +387,6 @@ static struct bus_type vio_bus_type = {
.match = vio_bus_match,
.probe = vio_bus_probe,
.remove = vio_bus_remove,
- .shutdown = vio_bus_shutdown,
};
/**
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index 598d111e8098..9204c15839c5 100644
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -53,17 +53,12 @@ struct vio_dev {
};
struct vio_driver {
- struct list_head node;
const struct vio_device_id *id_table;
int (*probe)(struct vio_dev *dev, const struct vio_device_id *id);
int (*remove)(struct vio_dev *dev);
- void (*shutdown)(struct vio_dev *dev);
- unsigned long driver_data;
struct device_driver driver;
};
-extern struct dma_mapping_ops vio_dma_ops;
-
extern int vio_register_driver(struct vio_driver *drv);
extern void vio_unregister_driver(struct vio_driver *drv);