diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-09 14:20:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-09 14:20:07 +0200 |
| commit | a5950f2617f71a3dce16520c4907bcdb31e654ba (patch) | |
| tree | 9e56b5eb5119737538a4763ec74a4271e5788a00 /arch | |
| parent | 87cbde8d9081b91df86a21d0d743cd700e04890a (diff) | |
| parent | eb672c0239da9084fc8103b63ba5fdaec6aab8be (diff) | |
| download | linux-0-day-a5950f2617f71a3dce16520c4907bcdb31e654ba.tar.gz linux-0-day-a5950f2617f71a3dce16520c4907bcdb31e654ba.tar.xz | |
Merge back suspend/resume/hibernate material for v4.15.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/common/locomo.c | 24 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/locomo.h | 2 |
2 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 6c7b06854fced..51936bde1eb27 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -826,28 +826,6 @@ static int locomo_match(struct device *_dev, struct device_driver *_drv) return dev->devid == drv->devid; } -static int locomo_bus_suspend(struct device *dev, pm_message_t state) -{ - struct locomo_dev *ldev = LOCOMO_DEV(dev); - struct locomo_driver *drv = LOCOMO_DRV(dev->driver); - int ret = 0; - - if (drv && drv->suspend) - ret = drv->suspend(ldev, state); - return ret; -} - -static int locomo_bus_resume(struct device *dev) -{ - struct locomo_dev *ldev = LOCOMO_DEV(dev); - struct locomo_driver *drv = LOCOMO_DRV(dev->driver); - int ret = 0; - - if (drv && drv->resume) - ret = drv->resume(ldev); - return ret; -} - static int locomo_bus_probe(struct device *dev) { struct locomo_dev *ldev = LOCOMO_DEV(dev); @@ -875,8 +853,6 @@ struct bus_type locomo_bus_type = { .match = locomo_match, .probe = locomo_bus_probe, .remove = locomo_bus_remove, - .suspend = locomo_bus_suspend, - .resume = locomo_bus_resume, }; int locomo_driver_register(struct locomo_driver *driver) diff --git a/arch/arm/include/asm/hardware/locomo.h b/arch/arm/include/asm/hardware/locomo.h index 74e51d6bd93fd..f8712e3c29cfe 100644 --- a/arch/arm/include/asm/hardware/locomo.h +++ b/arch/arm/include/asm/hardware/locomo.h @@ -189,8 +189,6 @@ struct locomo_driver { unsigned int devid; int (*probe)(struct locomo_dev *); int (*remove)(struct locomo_dev *); - int (*suspend)(struct locomo_dev *, pm_message_t); - int (*resume)(struct locomo_dev *); }; #define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv) |