Skip to content

Commit

Permalink
PM: ARM: locomo: Drop suspend and resume bus type callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Oct 4, 2017
1 parent 64ec72a commit eb672c0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
24 changes: 0 additions & 24 deletions arch/arm/common/locomo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/include/asm/hardware/locomo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit eb672c0

Please sign in to comment.