Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / drivers / uwb / umc-bus.c

diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index 88a290f..c857140 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);