diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-15 18:03:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-18 17:27:03 +0100 |
| commit | c5b68807c6563bf3882c94268ca09198d2e574ae (patch) | |
| tree | ef902a4be8f67e0080b1600d337802ddc4351d3c | |
| parent | f1f0b57db01d1045d163eeb05d5a4e7bd934561a (diff) | |
| download | linux-c5b68807c6563bf3882c94268ca09198d2e574ae.tar.gz linux-c5b68807c6563bf3882c94268ca09198d2e574ae.tar.bz2 linux-c5b68807c6563bf3882c94268ca09198d2e574ae.zip | |
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>
| -rw-r--r-- | drivers/uwb/umc-bus.c | 34 | ||||
| -rw-r--r-- | include/linux/uwb/umc.h | 2 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c index 88a290f57ea0..c8571405146d 100644 --- 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 ba82f03d8287..02112299a1d3 100644 --- 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 *); |