diff options
-rw-r--r-- | drivers/mfd/mcp-core.c | 28 | ||||
-rw-r--r-- | include/linux/mfd/mcp.h | 2 |
2 files changed, 0 insertions, 30 deletions
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index c409d6327140..6acf2e03f2ba 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c | |||
@@ -47,39 +47,11 @@ static int mcp_bus_remove(struct device *dev) | |||
47 | return 0; | 47 | return 0; |
48 | } | 48 | } |
49 | 49 | ||
50 | static int mcp_bus_suspend(struct device *dev, pm_message_t state) | ||
51 | { | ||
52 | struct mcp *mcp = to_mcp(dev); | ||
53 | int ret = 0; | ||
54 | |||
55 | if (dev->driver) { | ||
56 | struct mcp_driver *drv = to_mcp_driver(dev->driver); | ||
57 | |||
58 | ret = drv->suspend(mcp, state); | ||
59 | } | ||
60 | return ret; | ||
61 | } | ||
62 | |||
63 | static int mcp_bus_resume(struct device *dev) | ||
64 | { | ||
65 | struct mcp *mcp = to_mcp(dev); | ||
66 | int ret = 0; | ||
67 | |||
68 | if (dev->driver) { | ||
69 | struct mcp_driver *drv = to_mcp_driver(dev->driver); | ||
70 | |||
71 | ret = drv->resume(mcp); | ||
72 | } | ||
73 | return ret; | ||
74 | } | ||
75 | |||
76 | static struct bus_type mcp_bus_type = { | 50 | static struct bus_type mcp_bus_type = { |
77 | .name = "mcp", | 51 | .name = "mcp", |
78 | .match = mcp_bus_match, | 52 | .match = mcp_bus_match, |
79 | .probe = mcp_bus_probe, | 53 | .probe = mcp_bus_probe, |
80 | .remove = mcp_bus_remove, | 54 | .remove = mcp_bus_remove, |
81 | .suspend = mcp_bus_suspend, | ||
82 | .resume = mcp_bus_resume, | ||
83 | }; | 55 | }; |
84 | 56 | ||
85 | /** | 57 | /** |
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h index bfcdf6d3f1bf..a9e8bd157673 100644 --- a/include/linux/mfd/mcp.h +++ b/include/linux/mfd/mcp.h | |||
@@ -48,8 +48,6 @@ struct mcp_driver { | |||
48 | struct device_driver drv; | 48 | struct device_driver drv; |
49 | int (*probe)(struct mcp *); | 49 | int (*probe)(struct mcp *); |
50 | void (*remove)(struct mcp *); | 50 | void (*remove)(struct mcp *); |
51 | int (*suspend)(struct mcp *, pm_message_t); | ||
52 | int (*resume)(struct mcp *); | ||
53 | }; | 51 | }; |
54 | 52 | ||
55 | int mcp_driver_register(struct mcp_driver *); | 53 | int mcp_driver_register(struct mcp_driver *); |