diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-26 16:45:44 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-04 18:40:57 -0400 |
commit | eb672c0239da9084fc8103b63ba5fdaec6aab8be (patch) | |
tree | 9f5f4826e9439316d5939899e995ecc58e3fb410 | |
parent | 64ec72a1ece37d9bc7ba8b11d6091ce7cb1d8eec (diff) |
PM: ARM: locomo: Drop suspend and resume bus type callbacks
None of the locomo drivers in the tree implements the suspend and
resume callbacks from struct locomo_driver, so drop them and drop
the corresponding callbacks from locomo_bus_type.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
-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 6c7b06854fce..51936bde1eb2 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) | |||
826 | return dev->devid == drv->devid; | 826 | return dev->devid == drv->devid; |
827 | } | 827 | } |
828 | 828 | ||
829 | static int locomo_bus_suspend(struct device *dev, pm_message_t state) | ||
830 | { | ||
831 | struct locomo_dev *ldev = LOCOMO_DEV(dev); | ||
832 | struct locomo_driver *drv = LOCOMO_DRV(dev->driver); | ||
833 | int ret = 0; | ||
834 | |||
835 | if (drv && drv->suspend) | ||
836 | ret = drv->suspend(ldev, state); | ||
837 | return ret; | ||
838 | } | ||
839 | |||
840 | static int locomo_bus_resume(struct device *dev) | ||
841 | { | ||
842 | struct locomo_dev *ldev = LOCOMO_DEV(dev); | ||
843 | struct locomo_driver *drv = LOCOMO_DRV(dev->driver); | ||
844 | int ret = 0; | ||
845 | |||
846 | if (drv && drv->resume) | ||
847 | ret = drv->resume(ldev); | ||
848 | return ret; | ||
849 | } | ||
850 | |||
851 | static int locomo_bus_probe(struct device *dev) | 829 | static int locomo_bus_probe(struct device *dev) |
852 | { | 830 | { |
853 | struct locomo_dev *ldev = LOCOMO_DEV(dev); | 831 | struct locomo_dev *ldev = LOCOMO_DEV(dev); |
@@ -875,8 +853,6 @@ struct bus_type locomo_bus_type = { | |||
875 | .match = locomo_match, | 853 | .match = locomo_match, |
876 | .probe = locomo_bus_probe, | 854 | .probe = locomo_bus_probe, |
877 | .remove = locomo_bus_remove, | 855 | .remove = locomo_bus_remove, |
878 | .suspend = locomo_bus_suspend, | ||
879 | .resume = locomo_bus_resume, | ||
880 | }; | 856 | }; |
881 | 857 | ||
882 | int locomo_driver_register(struct locomo_driver *driver) | 858 | 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 74e51d6bd93f..f8712e3c29cf 100644 --- a/arch/arm/include/asm/hardware/locomo.h +++ b/arch/arm/include/asm/hardware/locomo.h | |||
@@ -189,8 +189,6 @@ struct locomo_driver { | |||
189 | unsigned int devid; | 189 | unsigned int devid; |
190 | int (*probe)(struct locomo_dev *); | 190 | int (*probe)(struct locomo_dev *); |
191 | int (*remove)(struct locomo_dev *); | 191 | int (*remove)(struct locomo_dev *); |
192 | int (*suspend)(struct locomo_dev *, pm_message_t); | ||
193 | int (*resume)(struct locomo_dev *); | ||
194 | }; | 192 | }; |
195 | 193 | ||
196 | #define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv) | 194 | #define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv) |