From patchwork Sat Jun 30 18:13:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 10498369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D0B17602BF for ; Sat, 30 Jun 2018 18:14:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFE7128F8A for ; Sat, 30 Jun 2018 18:14:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B46B928F8C; Sat, 30 Jun 2018 18:14:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C16D28F8A for ; Sat, 30 Jun 2018 18:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbeF3SON (ORCPT ); Sat, 30 Jun 2018 14:14:13 -0400 Received: from mail.bugwerft.de ([46.23.86.59]:45450 "EHLO mail.bugwerft.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725AbeF3SOM (ORCPT ); Sat, 30 Jun 2018 14:14:12 -0400 Received: from localhost.localdomain (p57BC976F.dip0.t-ipconnect.de [87.188.151.111]) by mail.bugwerft.de (Postfix) with ESMTPSA id C68C028C5F3; Sat, 30 Jun 2018 18:10:54 +0000 (UTC) From: Daniel Mack To: ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: robert.jarzmik@free.fr, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Daniel Mack Subject: [PATCH v2 1/7] mmc: pxamci: remove irq from private context Date: Sat, 30 Jun 2018 20:13:59 +0200 Message-Id: <20180630181405.17630-2-daniel@zonque.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630181405.17630-1-daniel@zonque.org> References: <20180630181405.17630-1-daniel@zonque.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This seems to be a left-over from times before the IRQ was handled by devm functions. Remove it. Signed-off-by: Daniel Mack Acked-by: Robert Jarzmik --- drivers/mmc/host/pxamci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 6c94474e36f4..f0968882dbd3 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -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;