Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-26
-24
arch/arm/common/locomo.c
··· 826 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 829 static int locomo_bus_probe(struct device *dev) 852 830 { 853 831 struct locomo_dev *ldev = LOCOMO_DEV(dev); ··· 853 875 .match = locomo_match, 854 876 .probe = locomo_bus_probe, 855 877 .remove = locomo_bus_remove, 856 - .suspend = locomo_bus_suspend, 857 - .resume = locomo_bus_resume, 858 878 }; 859 879 860 880 int locomo_driver_register(struct locomo_driver *driver)
-2
arch/arm/include/asm/hardware/locomo.h
··· 189 189 unsigned int devid; 190 190 int (*probe)(struct locomo_dev *); 191 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 194 #define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv)