aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-10-06 04:28:35 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-10 06:40:32 -0500
commitd99903ca4c89c3aa325845cf87ff249d0b432261 (patch)
tree5514062bfb0e3cde110318483a3c8239c5db3940
parent20d5a70344e526f51efe50861be10f6d743b7706 (diff)
mmc: core: Remove superfluous ifdefs for SDIO bus' PM callbacks
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/sdio_bus.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 6da97b170563..f09040bf5484 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -196,8 +196,6 @@ static int sdio_bus_remove(struct device *dev)
196 return ret; 196 return ret;
197} 197}
198 198
199#ifdef CONFIG_PM
200
201static const struct dev_pm_ops sdio_bus_pm_ops = { 199static const struct dev_pm_ops sdio_bus_pm_ops = {
202 SET_SYSTEM_SLEEP_PM_OPS(pm_generic_suspend, pm_generic_resume) 200 SET_SYSTEM_SLEEP_PM_OPS(pm_generic_suspend, pm_generic_resume)
203 SET_RUNTIME_PM_OPS( 201 SET_RUNTIME_PM_OPS(
@@ -207,14 +205,6 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
207 ) 205 )
208}; 206};
209 207
210#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)
211
212#else /* !CONFIG_PM */
213
214#define SDIO_PM_OPS_PTR NULL
215
216#endif /* !CONFIG_PM */
217
218static struct bus_type sdio_bus_type = { 208static struct bus_type sdio_bus_type = {
219 .name = "sdio", 209 .name = "sdio",
220 .dev_groups = sdio_dev_groups, 210 .dev_groups = sdio_dev_groups,
@@ -222,7 +212,7 @@ static struct bus_type sdio_bus_type = {
222 .uevent = sdio_bus_uevent, 212 .uevent = sdio_bus_uevent,
223 .probe = sdio_bus_probe, 213 .probe = sdio_bus_probe,
224 .remove = sdio_bus_remove, 214 .remove = sdio_bus_remove,
225 .pm = SDIO_PM_OPS_PTR, 215 .pm = &sdio_bus_pm_ops,
226}; 216};
227 217
228int sdio_register_bus(void) 218int sdio_register_bus(void)