Skip to content

Commit

Permalink
MFD: mcp-core: remove legacy driver suspend/resume methods
Browse files Browse the repository at this point in the history
The legacy driver suspend/resume methods are no longer used, so get rid
of them.

Acked-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 18, 2012
1 parent 5a09b71 commit cf4abfc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
28 changes: 0 additions & 28 deletions drivers/mfd/mcp-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,39 +47,11 @@ static int mcp_bus_remove(struct device *dev)
return 0;
}

static int mcp_bus_suspend(struct device *dev, pm_message_t state)
{
struct mcp *mcp = to_mcp(dev);
int ret = 0;

if (dev->driver) {
struct mcp_driver *drv = to_mcp_driver(dev->driver);

ret = drv->suspend(mcp, state);
}
return ret;
}

static int mcp_bus_resume(struct device *dev)
{
struct mcp *mcp = to_mcp(dev);
int ret = 0;

if (dev->driver) {
struct mcp_driver *drv = to_mcp_driver(dev->driver);

ret = drv->resume(mcp);
}
return ret;
}

static struct bus_type mcp_bus_type = {
.name = "mcp",
.match = mcp_bus_match,
.probe = mcp_bus_probe,
.remove = mcp_bus_remove,
.suspend = mcp_bus_suspend,
.resume = mcp_bus_resume,
};

/**
Expand Down
2 changes: 0 additions & 2 deletions include/linux/mfd/mcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ struct mcp_driver {
struct device_driver drv;
int (*probe)(struct mcp *);
void (*remove)(struct mcp *);
int (*suspend)(struct mcp *, pm_message_t);
int (*resume)(struct mcp *);
};

int mcp_driver_register(struct mcp_driver *);
Expand Down

0 comments on commit cf4abfc

Please sign in to comment.