diff options
| author | JP Abgrall <jpa@google.com> | 2011-12-20 16:51:53 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2011-12-20 16:51:53 -0800 |
| commit | 0a6f1c045620244664c96754809ac0ecd496bf56 (patch) | |
| tree | 7eab8acb8c531c8683b18c52a088e7d1ea8346f0 /drivers/mmc | |
| parent | d6668d3a5e2e72ecf9fd949cdbf65f40407b45ea (diff) | |
| parent | f16e6fb3e3bbbc279579b3c3def7951787c88a0a (diff) | |
| download | kernel_samsung_crespo-0a6f1c045620244664c96754809ac0ecd496bf56.zip kernel_samsung_crespo-0a6f1c045620244664c96754809ac0ecd496bf56.tar.gz kernel_samsung_crespo-0a6f1c045620244664c96754809ac0ecd496bf56.tar.bz2 | |
Merge remote branch 'common/android-3.0' into android-samsung-30-wip-mergedown
* common/android-3.0:
Revert "usb: gadget: rndis: don't use dev_get_stats"
net: wireless: bcmdhd: Enable wlan access on resume for all sdio functions
net: wireless: bcmdhd: Fix P2P interface removal
net: wireless: bcm4329: Fix pno_enable if disassociated
net: wireless: bcmdhd: Fix proper scan command even if request is NULL
net: wireless: bcmdhd: Decrease event wake_lock timeout to 1500 ms
net: wireless: bcmdhd: Fix getting arp_hostip table
net: wireless: bcmdhd: Allow to push more packets to FW for Tx
net: wireless: bcmdhd: Fix scan crash in ibss mode
net: wireless: bcmdhd: Add FW reloading in case of FW hang
net: wireless: bcmdhd: Update to Version 5.90.125.94.1
net: wireless: bcmdhd: Use CONFIG_DHD_USE_STATIC_BUF for preallocated memory
wireless: Protect regdomain change by mutex
mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
usb: gadget: android: Don't allow changing the functions list if enabled
usb: gadget: android: Cancel pending ctrlrequest before disabling
ARM: idle: call idle notifiers before stopping nohz tick
usb: gadget: android: Reset next_string_id before enable
Bluetooth: Keep master role when SCO or eSCO is active
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/bus.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 393d817..e07d6c9 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -120,18 +120,19 @@ static int mmc_bus_remove(struct device *dev) return 0; } -static int mmc_bus_suspend(struct device *dev, pm_message_t state) +static int mmc_bus_pm_suspend(struct device *dev) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = mmc_dev_to_card(dev); int ret = 0; + pm_message_t state = { PM_EVENT_SUSPEND }; if (dev->driver && drv->suspend) ret = drv->suspend(card, state); return ret; } -static int mmc_bus_resume(struct device *dev) +static int mmc_bus_pm_resume(struct device *dev) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = mmc_dev_to_card(dev); @@ -143,7 +144,6 @@ static int mmc_bus_resume(struct device *dev) } #ifdef CONFIG_PM_RUNTIME - static int mmc_runtime_suspend(struct device *dev) { struct mmc_card *card = mmc_dev_to_card(dev); @@ -162,21 +162,13 @@ static int mmc_runtime_idle(struct device *dev) { return pm_runtime_suspend(dev); } +#endif /* CONFIG_PM_RUNTIME */ static const struct dev_pm_ops mmc_bus_pm_ops = { - .runtime_suspend = mmc_runtime_suspend, - .runtime_resume = mmc_runtime_resume, - .runtime_idle = mmc_runtime_idle, + SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_pm_suspend, mmc_bus_pm_resume) + SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume, mmc_runtime_idle) }; -#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) - -#else /* !CONFIG_PM_RUNTIME */ - -#define MMC_PM_OPS_PTR NULL - -#endif /* !CONFIG_PM_RUNTIME */ - static struct bus_type mmc_bus_type = { .name = "mmc", .dev_attrs = mmc_dev_attrs, @@ -184,9 +176,7 @@ static struct bus_type mmc_bus_type = { .uevent = mmc_bus_uevent, .probe = mmc_bus_probe, .remove = mmc_bus_remove, - .suspend = mmc_bus_suspend, - .resume = mmc_bus_resume, - .pm = MMC_PM_OPS_PTR, + .pm = &mmc_bus_pm_ops, }; int mmc_register_bus(void) |