UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

omap_hsmmc: cleanup macro usage 

Use macro mmc_slot() in omap_hsmmc.

Signed-off-by: Denis Karpov <ext-denis.2.karpov@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: Matt Fleming <matt@console-pimps.org>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Philip Langdale <philipl@overt.org>
Cc: "Madhusudhan" <madhu.cr@ti.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Denis Karpov 2009-09-22 16:44:55 -07:00 committed by Linus Torvalds
parent 0a40e64786
commit 191d1f1de1
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/mmc/host/omap_hsmmc.c
View File

@ -368,9 +368,8 @@ int mmc_omap_cover_is_closed(struct mmc_omap_host *host)
{ {
int r = 1; int r = 1;
if (host->pdata->slots[host->slot_id].get_cover_state) if (mmc_slot(host).get_cover_state)
r = host->pdata->slots[host->slot_id].get_cover_state(host->dev, r = mmc_slot(host).get_cover_state(host->dev, host->slot_id);
host->slot_id);
return r; return r;
} }
@ -393,9 +392,8 @@ mmc_omap_show_slot_name(struct device *dev, struct device_attribute *attr,
{ {
struct mmc_host *mmc = container_of(dev, struct mmc_host, class_dev); struct mmc_host *mmc = container_of(dev, struct mmc_host, class_dev);
struct mmc_omap_host *host = mmc_priv(mmc); struct mmc_omap_host *host = mmc_priv(mmc);
struct omap_mmc_slot_data slot = host->pdata->slots[host->slot_id];
return sprintf(buf, "%s\n", slot.name); return sprintf(buf, "%s\n", mmc_slot(host).name);
} }
static DEVICE_ATTR(slot_name, S_IRUGO, mmc_omap_show_slot_name, NULL); static DEVICE_ATTR(slot_name, S_IRUGO, mmc_omap_show_slot_name, NULL);
@ -632,7 +630,8 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
(status & CMD_CRC)) { (status & CMD_CRC)) {
if (host->cmd) { if (host->cmd) {
if (status & CMD_TIMEOUT) { if (status & CMD_TIMEOUT) {
mmc_omap_reset_controller_fsm(host, SRC); mmc_omap_reset_controller_fsm(host,
SRC);
host->cmd->error = -ETIMEDOUT; host->cmd->error = -ETIMEDOUT;
} else { } else {
host->cmd->error = -EILSEQ; host->cmd->error = -EILSEQ;
@ -775,7 +774,7 @@ static void mmc_omap_detect(struct work_struct *work)
sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch"); sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");
if (mmc_slot(host).card_detect) if (slot->card_detect)
carddetect = slot->card_detect(slot->card_detect_irq); carddetect = slot->card_detect(slot->card_detect_irq);
else else
carddetect = -ENOSYS; carddetect = -ENOSYS;
@ -830,7 +829,7 @@ static void mmc_omap_config_dma_params(struct mmc_omap_host *host,
sg_dma_address(sgl), 0, 0); sg_dma_address(sgl), 0, 0);
} else { } else {
omap_set_dma_src_params(dma_ch, 0, OMAP_DMA_AMODE_CONSTANT, omap_set_dma_src_params(dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
(host->mapbase + OMAP_HSMMC_DATA), 0, 0); (host->mapbase + OMAP_HSMMC_DATA), 0, 0);
omap_set_dma_dest_params(dma_ch, 0, OMAP_DMA_AMODE_POST_INC, omap_set_dma_dest_params(dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
sg_dma_address(sgl), 0, 0); sg_dma_address(sgl), 0, 0);
} }
@ -918,7 +917,7 @@ mmc_omap_start_dma_transfer(struct mmc_omap_host *host, struct mmc_request *req)
} }
ret = omap_request_dma(mmc_omap_get_dma_sync_dev(host, data), "MMC/SD", ret = omap_request_dma(mmc_omap_get_dma_sync_dev(host, data), "MMC/SD",
mmc_omap_dma_cb,host, &dma_ch); mmc_omap_dma_cb, host, &dma_ch);
if (ret != 0) { if (ret != 0) {
dev_err(mmc_dev(host->mmc), dev_err(mmc_dev(host->mmc),
"%s: omap_request_dma() failed with %d\n", "%s: omap_request_dma() failed with %d\n",
@ -1138,21 +1137,19 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
static int omap_hsmmc_get_cd(struct mmc_host *mmc) static int omap_hsmmc_get_cd(struct mmc_host *mmc)
{ {
struct mmc_omap_host *host = mmc_priv(mmc); struct mmc_omap_host *host = mmc_priv(mmc);
struct omap_mmc_platform_data *pdata = host->pdata;
if (!pdata->slots[0].card_detect) if (!mmc_slot(host).card_detect)
return -ENOSYS; return -ENOSYS;
return pdata->slots[0].card_detect(pdata->slots[0].card_detect_irq); return mmc_slot(host).card_detect(mmc_slot(host).card_detect_irq);
} }
static int omap_hsmmc_get_ro(struct mmc_host *mmc) static int omap_hsmmc_get_ro(struct mmc_host *mmc)
{ {
struct mmc_omap_host *host = mmc_priv(mmc); struct mmc_omap_host *host = mmc_priv(mmc);
struct omap_mmc_platform_data *pdata = host->pdata;
if (!pdata->slots[0].get_ro) if (!mmc_slot(host).get_ro)
return -ENOSYS; return -ENOSYS;
return pdata->slots[0].get_ro(host->dev, 0); return mmc_slot(host).get_ro(host->dev, 0);
} }
static void omap_hsmmc_init(struct mmc_omap_host *host) static void omap_hsmmc_init(struct mmc_omap_host *host)
@ -1563,7 +1560,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
INIT_WORK(&host->mmc_carddetect_work, mmc_omap_detect); INIT_WORK(&host->mmc_carddetect_work, mmc_omap_detect);
if (pdata->slots[host->slot_id].power_saving) if (mmc_slot(host).power_saving)
mmc->ops = &mmc_omap_ps_ops; mmc->ops = &mmc_omap_ps_ops;
else else
mmc->ops = &mmc_omap_ops; mmc->ops = &mmc_omap_ops;
@ -1633,12 +1630,12 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED | mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_WAIT_WHILE_BUSY; MMC_CAP_WAIT_WHILE_BUSY;
if (pdata->slots[host->slot_id].wires >= 8) if (mmc_slot(host).wires >= 8)
mmc->caps |= MMC_CAP_8_BIT_DATA; mmc->caps |= MMC_CAP_8_BIT_DATA;
else if (pdata->slots[host->slot_id].wires >= 4) else if (mmc_slot(host).wires >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA; mmc->caps |= MMC_CAP_4_BIT_DATA;
if (pdata->slots[host->slot_id].nonremovable) if (mmc_slot(host).nonremovable)
mmc->caps |= MMC_CAP_NONREMOVABLE; mmc->caps |= MMC_CAP_NONREMOVABLE;
omap_hsmmc_init(host); omap_hsmmc_init(host);
@ -1700,13 +1697,12 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
mmc_add_host(mmc); mmc_add_host(mmc);
if (host->pdata->slots[host->slot_id].name != NULL) { if (mmc_slot(host).name != NULL) {
ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name); ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
if (ret < 0) if (ret < 0)
goto err_slot_name; goto err_slot_name;
} }
if (mmc_slot(host).card_detect_irq && if (mmc_slot(host).card_detect_irq && mmc_slot(host).get_cover_state) {
host->pdata->slots[host->slot_id].get_cover_state) {
ret = device_create_file(&mmc->class_dev, ret = device_create_file(&mmc->class_dev,
&dev_attr_cover_switch); &dev_attr_cover_switch);
if (ret < 0) if (ret < 0)
@ -1812,7 +1808,7 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
OMAP_HSMMC_WRITE(host->base, HCTL, OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP); OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
mmc_host_disable(host->mmc); mmc_host_disable(host->mmc);
clk_disable(host->iclk); clk_disable(host->iclk);
clk_disable(host->dbclk); clk_disable(host->dbclk);