mmc: pxamci: remove irq from private context
authorDaniel Mack <daniel@zonque.org>
Sat, 30 Jun 2018 18:13:59 +0000 (20:13 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 16 Jul 2018 09:21:45 +0000 (11:21 +0200)
This seems to be a left-over from times before the IRQ was handled by devm
functions. Remove it.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/pxamci.c

index 6c94474..f096888 100644 (file)
@@ -58,7 +58,6 @@ struct pxamci_host {
        void __iomem            *base;
        struct clk              *clk;
        unsigned long           clkrate;
-       int                     irq;
        unsigned int            clkrt;
        unsigned int            cmdat;
        unsigned int            imask;
@@ -711,7 +710,6 @@ static int pxamci_probe(struct platform_device *pdev)
 
        spin_lock_init(&host->lock);
        host->res = r;
-       host->irq = irq;
        host->imask = MMC_I_MASK_ALL;
 
        host->base = devm_ioremap_resource(&pdev->dev, r);
@@ -729,7 +727,7 @@ static int pxamci_probe(struct platform_device *pdev)
        writel(64, host->base + MMC_RESTO);
        writel(host->imask, host->base + MMC_I_MASK);
 
-       ret = devm_request_irq(&pdev->dev, host->irq, pxamci_irq, 0,
+       ret = devm_request_irq(&pdev->dev, irq, pxamci_irq, 0,
                               DRIVER_NAME, host);
        if (ret)
                goto out;