diff options
| author | Chris Ball <cjb@laptop.org> | 2013-09-06 07:29:05 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-09-06 07:29:05 -0400 |
| commit | 9d731e7539713acc0ec7b67a5a91357c455d2334 (patch) | |
| tree | f8979b956f68f77a9d995c816df59d3368a84bc2 /drivers/mmc | |
| parent | b7d06c85a333b18b3fa03d2242cfec91f91fbea2 (diff) | |
| download | op-kernel-dev-9d731e7539713acc0ec7b67a5a91357c455d2334.zip op-kernel-dev-9d731e7539713acc0ec7b67a5a91357c455d2334.tar.gz | |
Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
This reverts commit 3af9d15c719017feb63fa99f89ac6009a5a3d467, which
causes a build failure:
drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializer
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc.h | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 39c2f45..86fd21e 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -68,6 +68,7 @@ struct tmio_mmc_host { enum tmio_mmc_power power; /* Callbacks for clock / power control */ + void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); /* pio related stuff */ diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 67a3bf1..b380225 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -777,6 +777,9 @@ static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd) /* .set_ios() is returning void, so, no chance to report an error */ + if (host->set_pwr) + host->set_pwr(host->pdev, 1); + if (!IS_ERR(mmc->supply.vmmc)) { ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); /* @@ -810,6 +813,9 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host) if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); + + if (host->set_pwr) + host->set_pwr(host->pdev, 0); } /* Set MMC clock / power. @@ -996,6 +1002,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, _host->pdev = pdev; platform_set_drvdata(pdev, mmc); + _host->set_pwr = pdata->set_pwr; _host->set_clk_div = pdata->set_clk_div; /* SD control register space size is 0x200, 0x400 for bus_shift=1 */ |
