Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb672c02 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 64ec72a1

arch/arm/common/locomo.c

+0 −24
Original line number Diff line number Diff line
@@ -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)

arch/arm/include/asm/hardware/locomo.h

+0 −2
Original line number Diff line number Diff line
@@ -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)