diff options
-rw-r--r-- | arch/powerpc/kernel/vio.c | 11 | ||||
-rw-r--r-- | include/asm-powerpc/vio.h | 5 |
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) | |||
168 | return 1; | 168 | return 1; |
169 | } | 169 | } |
170 | 170 | ||
171 | /* convert from struct device to struct vio_dev and pass to driver. */ | ||
172 | static void vio_bus_shutdown(struct device *dev) | ||
173 | { | ||
174 | struct vio_dev *viodev = to_vio_dev(dev); | ||
175 | struct vio_driver *viodrv = to_vio_driver(dev->driver); | ||
176 | |||
177 | if (dev->driver && viodrv->shutdown) | ||
178 | viodrv->shutdown(viodev); | ||
179 | } | ||
180 | |||
181 | /** | 171 | /** |
182 | * vio_register_driver: - Register a new vio driver | 172 | * vio_register_driver: - Register a new vio driver |
183 | * @drv: The vio_driver structure to be registered. | 173 | * @drv: The vio_driver structure to be registered. |
@@ -397,7 +387,6 @@ static struct bus_type vio_bus_type = { | |||
397 | .match = vio_bus_match, | 387 | .match = vio_bus_match, |
398 | .probe = vio_bus_probe, | 388 | .probe = vio_bus_probe, |
399 | .remove = vio_bus_remove, | 389 | .remove = vio_bus_remove, |
400 | .shutdown = vio_bus_shutdown, | ||
401 | }; | 390 | }; |
402 | 391 | ||
403 | /** | 392 | /** |
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 { | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | struct vio_driver { | 55 | struct vio_driver { |
56 | struct list_head node; | ||
57 | const struct vio_device_id *id_table; | 56 | const struct vio_device_id *id_table; |
58 | int (*probe)(struct vio_dev *dev, const struct vio_device_id *id); | 57 | int (*probe)(struct vio_dev *dev, const struct vio_device_id *id); |
59 | int (*remove)(struct vio_dev *dev); | 58 | int (*remove)(struct vio_dev *dev); |
60 | void (*shutdown)(struct vio_dev *dev); | ||
61 | unsigned long driver_data; | ||
62 | struct device_driver driver; | 59 | struct device_driver driver; |
63 | }; | 60 | }; |
64 | 61 | ||
65 | extern struct dma_mapping_ops vio_dma_ops; | ||
66 | |||
67 | extern int vio_register_driver(struct vio_driver *drv); | 62 | extern int vio_register_driver(struct vio_driver *drv); |
68 | extern void vio_unregister_driver(struct vio_driver *drv); | 63 | extern void vio_unregister_driver(struct vio_driver *drv); |
69 | 64 | ||