mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host

Member ocr_mask is never used and member irq we can replace with a
local variable in meson_mmc_probe. So let's remove both members.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index b99461ff61d838a8642edd6cdd07770e9430aad5..b9de3d4714bbd114324fe7983488bb3a009dd167 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -127,8 +127,6 @@ struct meson_host {
 
        spinlock_t lock;
        void __iomem *regs;
-       int irq;
-       u32 ocr_mask;
        struct clk *core_clk;
        struct clk_mux mux;
        struct clk *mux_clk;
@@ -712,7 +710,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
        struct resource *res;
        struct meson_host *host;
        struct mmc_host *mmc;
-       int ret;
+       int ret, irq;
 
        mmc = mmc_alloc_host(sizeof(struct meson_host), &pdev->dev);
        if (!mmc)
@@ -744,8 +742,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
                goto free_host;
        }
 
-       host->irq = platform_get_irq(pdev, 0);
-       if (host->irq == 0) {
+       irq = platform_get_irq(pdev, 0);
+       if (!irq) {
                dev_err(&pdev->dev, "failed to get interrupt resource.\n");
                ret = -EINVAL;
                goto free_host;
@@ -773,9 +771,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
        writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);
        writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);
 
-       ret = devm_request_threaded_irq(&pdev->dev, host->irq,
-                                       meson_mmc_irq, meson_mmc_irq_thread,
-                                       IRQF_SHARED, DRIVER_NAME, host);
+       ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq,
+                                       meson_mmc_irq_thread, IRQF_SHARED,
+                                       DRIVER_NAME, host);
        if (ret)
                goto free_host;