diff options
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r-- | drivers/mmc/host/tmio_mmc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index ac52eb65395e..67c9d0f595ef 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c | |||
@@ -303,7 +303,7 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock) | |||
303 | 303 | ||
304 | static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) | 304 | static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) |
305 | { | 305 | { |
306 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 306 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
307 | struct tmio_mmc_data *pdata = cell->driver_data; | 307 | struct tmio_mmc_data *pdata = cell->driver_data; |
308 | 308 | ||
309 | /* | 309 | /* |
@@ -327,7 +327,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) | |||
327 | 327 | ||
328 | static void tmio_mmc_clk_start(struct tmio_mmc_host *host) | 328 | static void tmio_mmc_clk_start(struct tmio_mmc_host *host) |
329 | { | 329 | { |
330 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 330 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
331 | struct tmio_mmc_data *pdata = cell->driver_data; | 331 | struct tmio_mmc_data *pdata = cell->driver_data; |
332 | 332 | ||
333 | sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 | | 333 | sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 | |
@@ -669,7 +669,7 @@ out: | |||
669 | static irqreturn_t tmio_mmc_irq(int irq, void *devid) | 669 | static irqreturn_t tmio_mmc_irq(int irq, void *devid) |
670 | { | 670 | { |
671 | struct tmio_mmc_host *host = devid; | 671 | struct tmio_mmc_host *host = devid; |
672 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 672 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
673 | struct tmio_mmc_data *pdata = cell->driver_data; | 673 | struct tmio_mmc_data *pdata = cell->driver_data; |
674 | unsigned int ireg, irq_mask, status; | 674 | unsigned int ireg, irq_mask, status; |
675 | unsigned int sdio_ireg, sdio_irq_mask, sdio_status; | 675 | unsigned int sdio_ireg, sdio_irq_mask, sdio_status; |
@@ -799,7 +799,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host) | |||
799 | struct scatterlist *sg = host->sg_ptr, *sg_tmp; | 799 | struct scatterlist *sg = host->sg_ptr, *sg_tmp; |
800 | struct dma_async_tx_descriptor *desc = NULL; | 800 | struct dma_async_tx_descriptor *desc = NULL; |
801 | struct dma_chan *chan = host->chan_rx; | 801 | struct dma_chan *chan = host->chan_rx; |
802 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 802 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
803 | struct tmio_mmc_data *pdata = cell->driver_data; | 803 | struct tmio_mmc_data *pdata = cell->driver_data; |
804 | dma_cookie_t cookie; | 804 | dma_cookie_t cookie; |
805 | int ret, i; | 805 | int ret, i; |
@@ -869,7 +869,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) | |||
869 | struct scatterlist *sg = host->sg_ptr, *sg_tmp; | 869 | struct scatterlist *sg = host->sg_ptr, *sg_tmp; |
870 | struct dma_async_tx_descriptor *desc = NULL; | 870 | struct dma_async_tx_descriptor *desc = NULL; |
871 | struct dma_chan *chan = host->chan_tx; | 871 | struct dma_chan *chan = host->chan_tx; |
872 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 872 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
873 | struct tmio_mmc_data *pdata = cell->driver_data; | 873 | struct tmio_mmc_data *pdata = cell->driver_data; |
874 | dma_cookie_t cookie; | 874 | dma_cookie_t cookie; |
875 | int ret, i; | 875 | int ret, i; |
@@ -1063,7 +1063,7 @@ static void tmio_mmc_release_dma(struct tmio_mmc_host *host) | |||
1063 | static int tmio_mmc_start_data(struct tmio_mmc_host *host, | 1063 | static int tmio_mmc_start_data(struct tmio_mmc_host *host, |
1064 | struct mmc_data *data) | 1064 | struct mmc_data *data) |
1065 | { | 1065 | { |
1066 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 1066 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
1067 | struct tmio_mmc_data *pdata = cell->driver_data; | 1067 | struct tmio_mmc_data *pdata = cell->driver_data; |
1068 | 1068 | ||
1069 | pr_debug("setup data transfer: blocksize %08x nr_blocks %d\n", | 1069 | pr_debug("setup data transfer: blocksize %08x nr_blocks %d\n", |
@@ -1169,7 +1169,7 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
1169 | static int tmio_mmc_get_ro(struct mmc_host *mmc) | 1169 | static int tmio_mmc_get_ro(struct mmc_host *mmc) |
1170 | { | 1170 | { |
1171 | struct tmio_mmc_host *host = mmc_priv(mmc); | 1171 | struct tmio_mmc_host *host = mmc_priv(mmc); |
1172 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 1172 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
1173 | struct tmio_mmc_data *pdata = cell->driver_data; | 1173 | struct tmio_mmc_data *pdata = cell->driver_data; |
1174 | 1174 | ||
1175 | return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) || | 1175 | return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) || |
@@ -1179,7 +1179,7 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc) | |||
1179 | static int tmio_mmc_get_cd(struct mmc_host *mmc) | 1179 | static int tmio_mmc_get_cd(struct mmc_host *mmc) |
1180 | { | 1180 | { |
1181 | struct tmio_mmc_host *host = mmc_priv(mmc); | 1181 | struct tmio_mmc_host *host = mmc_priv(mmc); |
1182 | struct mfd_cell *cell = host->pdev->dev.platform_data; | 1182 | struct mfd_cell *cell = mfd_get_cell(host->pdev); |
1183 | struct tmio_mmc_data *pdata = cell->driver_data; | 1183 | struct tmio_mmc_data *pdata = cell->driver_data; |
1184 | 1184 | ||
1185 | if (!pdata->get_cd) | 1185 | if (!pdata->get_cd) |
@@ -1199,7 +1199,7 @@ static const struct mmc_host_ops tmio_mmc_ops = { | |||
1199 | #ifdef CONFIG_PM | 1199 | #ifdef CONFIG_PM |
1200 | static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state) | 1200 | static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state) |
1201 | { | 1201 | { |
1202 | struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; | 1202 | struct mfd_cell *cell = mfd_get_cell(dev); |
1203 | struct mmc_host *mmc = platform_get_drvdata(dev); | 1203 | struct mmc_host *mmc = platform_get_drvdata(dev); |
1204 | int ret; | 1204 | int ret; |
1205 | 1205 | ||
@@ -1214,7 +1214,7 @@ static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state) | |||
1214 | 1214 | ||
1215 | static int tmio_mmc_resume(struct platform_device *dev) | 1215 | static int tmio_mmc_resume(struct platform_device *dev) |
1216 | { | 1216 | { |
1217 | struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; | 1217 | struct mfd_cell *cell = mfd_get_cell(dev); |
1218 | struct mmc_host *mmc = platform_get_drvdata(dev); | 1218 | struct mmc_host *mmc = platform_get_drvdata(dev); |
1219 | int ret = 0; | 1219 | int ret = 0; |
1220 | 1220 | ||
@@ -1237,7 +1237,7 @@ out: | |||
1237 | 1237 | ||
1238 | static int __devinit tmio_mmc_probe(struct platform_device *dev) | 1238 | static int __devinit tmio_mmc_probe(struct platform_device *dev) |
1239 | { | 1239 | { |
1240 | struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; | 1240 | struct mfd_cell *cell = mfd_get_cell(dev); |
1241 | struct tmio_mmc_data *pdata; | 1241 | struct tmio_mmc_data *pdata; |
1242 | struct resource *res_ctl; | 1242 | struct resource *res_ctl; |
1243 | struct tmio_mmc_host *host; | 1243 | struct tmio_mmc_host *host; |
@@ -1352,7 +1352,7 @@ out: | |||
1352 | 1352 | ||
1353 | static int __devexit tmio_mmc_remove(struct platform_device *dev) | 1353 | static int __devexit tmio_mmc_remove(struct platform_device *dev) |
1354 | { | 1354 | { |
1355 | struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; | 1355 | struct mfd_cell *cell = mfd_get_cell(dev); |
1356 | struct mmc_host *mmc = platform_get_drvdata(dev); | 1356 | struct mmc_host *mmc = platform_get_drvdata(dev); |
1357 | 1357 | ||
1358 | platform_set_drvdata(dev, NULL); | 1358 | platform_set_drvdata(dev, NULL); |