renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

mmc: bfin_sdh: Remove redundant suspend and resume setting.

Browse Source 
mmc core suspend and resume functions had already called sdh_set_ios
with proper flags.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Sonic Zhang 2012-08-08 00:14:26 -04:00 committed by Chris Ball
parent 4ffdcf0469
commit c5e4a2e4c6
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/host/bfin_sdh.c
View File

@ -643,11 +643,6 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state)
if (mmc) if (mmc)
ret = mmc_suspend_host(mmc); ret = mmc_suspend_host(mmc);
#ifndef RSI_BLKSZ
bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);
#else
bfin_write_SDH_CFG(bfin_read_SDH_CFG() & ~PWR_ON);
#endif
peripheral_free_list(drv_data->pin_req); peripheral_free_list(drv_data->pin_req);
return ret; return ret;
@ -669,16 +664,6 @@ static int sdh_resume(struct platform_device *dev)
/* Secure Digital Host shares DMA with Nand controller */ /* Secure Digital Host shares DMA with Nand controller */
bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1); bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
#endif #endif
#ifndef RSI_BLKSZ
bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() | PWR_ON);
bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);
#else
bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN | PWR_ON);
#endif
SSYNC();
bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
SSYNC();
if (mmc) if (mmc)
ret = mmc_resume_host(mmc); ret = mmc_resume_host(mmc);