powerpc: Add a shutdown member to vio_driver

Add a shutdown member to struct vio_driver. We also need vio_bus_shutdown()
which converts from struct device to struct vio_dev and knows how to extract
the struct vio_driver.

Original patch adjusted for different location of vio.c.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 3aec492ec76721d363390ffda237202de8e71738..97082a4203ada988fbbf9b8735ce8f25dbafbd05 100644 (file)
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -69,6 +69,16 @@ 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 (viodrv->shutdown)
+               viodrv->shutdown(viodev);
+}
+
 /**
  * vio_register_driver: - Register a new vio driver
  * @drv:       The vio_driver structure to be registered.
@@ -82,6 +92,7 @@ int vio_register_driver(struct vio_driver *viodrv)
        viodrv->driver.bus = &vio_bus_type;
        viodrv->driver.probe = vio_bus_probe;
        viodrv->driver.remove = vio_bus_remove;
+       viodrv->driver.shutdown = vio_bus_shutdown;
 
        return driver_register(&viodrv->driver);
 }

diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index 104c58501d0ce0be0d8acfa03d512266359c7e52..e0ccf108277cd62e81e3d5e957428778a8841451 100644 (file)
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -58,6 +58,7 @@ struct vio_driver {
        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;
 };