diff options
| author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-04-04 15:38:07 +0200 |
|---|---|---|
| committer | Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> | 2011-04-06 15:17:26 +0200 |
| commit | b4d06bcf630234c8d51dabd2129d77d7ca91e456 (patch) | |
| tree | f03e3504ec98033b9bb4b78703e37c16c92a9cd2 | |
| parent | 7264324cad662758e2ce32817308aa9509b31cab (diff) | |
MMCI/mach-ux500: Removed use of bus_resume_flagsu8500-android-2.3_v0.53
The bus_resume_flags is not needed due to that mmci
is not using mmc_suspend_host and mmc_resume_host.
Change-Id: I0b2fcb2a8e39525bce163fcce8813f7ea66b3c76
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19920
Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/mmci.c | 3 | ||||
| -rw-r--r-- | include/linux/amba/mmci.h | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index da0c28e27d1..29585ac5519 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -108,7 +108,6 @@ static struct mmci_platform_data mop500_sdi0_data = { .vcard = "v-MMC-SD", .vdd_handler = sdi0_vdd_handler, .disable = 500, - .bus_resume_flags = MMC_NEEDS_UNSAFE_RESUME, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | @@ -199,7 +198,6 @@ static struct mmci_platform_data mop500_sdi1_data = { .vcc = "v-mmc", .vdd_handler = sdi1_vdd_handler, .disable = 500, - .bus_resume_flags = MMC_NEEDS_UNSAFE_RESUME, .ocr_mask = MMC_VDD_29_30, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | @@ -239,7 +237,6 @@ static struct stedma40_chan_cfg sdi2_dma_cfg_tx = { static struct mmci_platform_data mop500_sdi2_data = { .vcc = "v-mmc", .disable = 500, - .bus_resume_flags = MMC_NEEDS_UNSAFE_RESUME, .ocr_mask = MMC_VDD_165_195, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | @@ -280,7 +277,6 @@ static struct mmci_platform_data mop500_sdi4_data = { .vcc = "v-mmc", .vcard = "v-eMMC", .disable = 500, - .bus_resume_flags = MMC_NEEDS_UNSAFE_RESUME, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a42876aab4d..bd1e28cdcbc 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1526,9 +1526,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) /* We support these PM capabilities. */ mmc->pm_caps = MMC_PM_KEEP_POWER; - /* Use platform bus_resume_flags */ - mmc->bus_resume_flags = plat->bus_resume_flags; - /* * We can do SGIO */ diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 2f8133f429f..7b3386ba158 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -31,7 +31,6 @@ struct dma_chan; * @vcc: name of regulator for host * @vcard: name of regulator for card * @disable: disable timeout if host supports disable - * @bus_resume_flags: flags used for suspend and resume options * @f_max: the maximum operational frequency for this host in this * platform configuration. When this is specified it takes precedence * over the module parameter for the same frequency. @@ -73,7 +72,6 @@ struct mmci_platform_data { char *vcc; char *vcard; unsigned int disable; - unsigned int bus_resume_flags; unsigned int f_max; unsigned int ocr_mask; void (*vdd_handler)(struct device *, unsigned int vdd, |