uwb: Remove umc bus legacy suspend/resume support

There are currently no umc drivers implementing suspend/resume, so remove
the legacy suspend/resume support from the framework. If a umc driver ever
wants to implement suspend/resume they can use dev_pm_ops, which works out
of the box without any additional support necessary from the bus itself.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index 88a290f57ea0dd7630f94bdf69f7923a4640e18c..c8571405146d394bfd8df9c20146df39ba1da74c 100644 (file)
--- a/drivers/uwb/umc-bus.c
+++ b/drivers/uwb/umc-bus.c
@@ -163,38 +163,6 @@ static int umc_device_remove(struct device *dev)
        return 0;
 }
 
-static int umc_device_suspend(struct device *dev, pm_message_t state)
-{
-       struct umc_dev *umc;
-       struct umc_driver *umc_driver;
-       int err = 0;
-
-       umc = to_umc_dev(dev);
-
-       if (dev->driver) {
-               umc_driver = to_umc_driver(dev->driver);
-               if (umc_driver->suspend)
-                       err = umc_driver->suspend(umc, state);
-       }
-       return err;
-}
-
-static int umc_device_resume(struct device *dev)
-{
-       struct umc_dev *umc;
-       struct umc_driver *umc_driver;
-       int err = 0;
-
-       umc = to_umc_dev(dev);
-
-       if (dev->driver) {
-               umc_driver = to_umc_driver(dev->driver);
-               if (umc_driver->resume)
-                       err = umc_driver->resume(umc);
-       }
-       return err;
-}
-
 static ssize_t capability_id_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct umc_dev *umc = to_umc_dev(dev);
@@ -223,8 +191,6 @@ struct bus_type umc_bus_type = {
        .match          = umc_bus_match,
        .probe          = umc_device_probe,
        .remove         = umc_device_remove,
-       .suspend        = umc_device_suspend,
-       .resume         = umc_device_resume,
        .dev_groups     = umc_dev_groups,
 };
 EXPORT_SYMBOL_GPL(umc_bus_type);

diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index ba82f03d8287f7b5ef2c09a4ddfcf995860d7935..02112299a1d3d3907fc9810efad7bad1ccc0e8a5 100644 (file)
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -87,8 +87,6 @@ struct umc_driver {
 
        int  (*probe)(struct umc_dev *);
        void (*remove)(struct umc_dev *);
-       int  (*suspend)(struct umc_dev *, pm_message_t state);
-       int  (*resume)(struct umc_dev *);
        int  (*pre_reset)(struct umc_dev *);
        int  (*post_reset)(struct umc_dev *);