Skip to content

Commit

Permalink
mmc: core: Remove superfluous ifdefs for SDIO bus' PM callbacks
Browse files Browse the repository at this point in the history
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Ulf Hansson committed Nov 10, 2014
1 parent 20d5a70 commit d99903c
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions drivers/mmc/core/sdio_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ static int sdio_bus_remove(struct device *dev)
return ret;
}

#ifdef CONFIG_PM

static const struct dev_pm_ops sdio_bus_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_generic_suspend, pm_generic_resume)
SET_RUNTIME_PM_OPS(
Expand All @@ -207,22 +205,14 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
)
};

#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)

#else /* !CONFIG_PM */

#define SDIO_PM_OPS_PTR NULL

#endif /* !CONFIG_PM */

static struct bus_type sdio_bus_type = {
.name = "sdio",
.dev_groups = sdio_dev_groups,
.match = sdio_bus_match,
.uevent = sdio_bus_uevent,
.probe = sdio_bus_probe,
.remove = sdio_bus_remove,
.pm = SDIO_PM_OPS_PTR,
.pm = &sdio_bus_pm_ops,
};

int sdio_register_bus(void)
Expand Down

0 comments on commit d99903c

Please sign in to comment.