aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-19 08:16:57 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-26 08:31:03 -0500
commitc3cd5c076c3ab6a088d73e260b516bcda1dc9da4 (patch)
treeb04999ad95324cd5c065d76cf1d3ac8bf410fb12
parent4d7c07cd6c0379228e65c52776f22250e8f4a962 (diff)
mmc: mxs-mmc: No need to do NULL check on 'iores'
devm_ioremap_resource() already checks if 'iores' is NULL or not, so we can skip this manual check. While at it, move platform_get_resource() closer to devm_ioremap_resource() for better readability. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/mxs-mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index c049ac75a36a..0d307303ebb9 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -581,9 +581,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
581 struct regulator *reg_vmmc; 581 struct regulator *reg_vmmc;
582 struct mxs_ssp *ssp; 582 struct mxs_ssp *ssp;
583 583
584 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
585 irq_err = platform_get_irq(pdev, 0); 584 irq_err = platform_get_irq(pdev, 0);
586 if (!iores || irq_err < 0) 585 if (irq_err < 0)
587 return -EINVAL; 586 return -EINVAL;
588 587
589 mmc = mmc_alloc_host(sizeof(struct mxs_mmc_host), &pdev->dev); 588 mmc = mmc_alloc_host(sizeof(struct mxs_mmc_host), &pdev->dev);
@@ -593,6 +592,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
593 host = mmc_priv(mmc); 592 host = mmc_priv(mmc);
594 ssp = &host->ssp; 593 ssp = &host->ssp;
595 ssp->dev = &pdev->dev; 594 ssp->dev = &pdev->dev;
595 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
596 ssp->base = devm_ioremap_resource(&pdev->dev, iores); 596 ssp->base = devm_ioremap_resource(&pdev->dev, iores);
597 if (IS_ERR(ssp->base)) { 597 if (IS_ERR(ssp->base)) {
598 ret = PTR_ERR(ssp->base); 598 ret = PTR_ERR(ssp->base);