MIPS: ip22-gio: Remove legacy suspend/resume support

There are currently no gio device drivers that implement suspend/resume
and this patch removes the bus specific legacy suspend and resume callbacks.
This will allow us to eventually remove struct bus_type legacy suspend and
resume support altogether.

gio device drivers wanting to implement suspend and resume can use dev PM
ops which will work out of the box without further modifications necessary.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8920/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/gio_device.h b/arch/mips/include/asm/gio_device.h
index 4be1a57cdbb055915c862cff1fb55966b8214726..71a986e9b694d672823a87c17260f8fd39882e24 100644 (file)
--- a/arch/mips/include/asm/gio_device.h
+++ b/arch/mips/include/asm/gio_device.h
@@ -25,8 +25,6 @@ struct gio_driver {
 
        int  (*probe)(struct gio_device *, const struct gio_device_id *);
        void (*remove)(struct gio_device *);
-       int  (*suspend)(struct gio_device *, pm_message_t);
-       int  (*resume)(struct gio_device *);
        void (*shutdown)(struct gio_device *);
 
        struct device_driver driver;

diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index 8f1b86d4da84a8f4a4f894e50f61a76ef009554f..cdf1876000101e25a153f04415e622820418ba13 100644 (file)
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -152,28 +152,6 @@ static int gio_device_remove(struct device *dev)
        return 0;
 }
 
-static int gio_device_suspend(struct device *dev, pm_message_t state)
-{
-       struct gio_device *gio_dev = to_gio_device(dev);
-       struct gio_driver *drv = to_gio_driver(dev->driver);
-       int error = 0;
-
-       if (dev->driver && drv->suspend)
-               error = drv->suspend(gio_dev, state);
-       return error;
-}
-
-static int gio_device_resume(struct device *dev)
-{
-       struct gio_device *gio_dev = to_gio_device(dev);
-       struct gio_driver *drv = to_gio_driver(dev->driver);
-       int error = 0;
-
-       if (dev->driver && drv->resume)
-               error = drv->resume(gio_dev);
-       return error;
-}
-
 static void gio_device_shutdown(struct device *dev)
 {
        struct gio_device *gio_dev = to_gio_device(dev);
@@ -400,8 +378,6 @@ static struct bus_type gio_bus_type = {
        .match     = gio_bus_match,
        .probe     = gio_device_probe,
        .remove    = gio_device_remove,
-       .suspend   = gio_device_suspend,
-       .resume    = gio_device_resume,
        .shutdown  = gio_device_shutdown,
        .uevent    = gio_device_uevent,
 };