From patchwork Tue Feb 14 20:06:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9572713 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 A4107601E7 for ; Tue, 14 Feb 2017 20:08:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A28F626E4D for ; Tue, 14 Feb 2017 20:08:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9784828417; Tue, 14 Feb 2017 20:08:07 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 4729E2840E for ; Tue, 14 Feb 2017 20:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753491AbdBNUIG (ORCPT ); Tue, 14 Feb 2017 15:08:06 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35409 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754599AbdBNUHo (ORCPT ); Tue, 14 Feb 2017 15:07:44 -0500 Received: by mail-wm0-f65.google.com with SMTP id u63so5219751wmu.2 for ; Tue, 14 Feb 2017 12:07:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=6LQ2gHRNqUiYNDnXCgybcjiLwRKZv05WXYOXy4P5J3Q=; b=GrfAikL/3JEexEhF5fKTCF9rossKZNo3aYmG9D7NpiS/8ROWv0PimPTvskigC9uEJI 6CqvsT1cXR6/o5aKE0HNnlWGPwkir0Jts1zEaJ65hWQbGH6lHrdt84wnaTjj18c9P5Iv +dKCDhwhSdVGnvlOn5sEuvs6jEVBuNGNWRbj+8tbVk2RUlc8RZIz9jgCn5+yqTAlJwqF eTNJOTskp1ATIL9Y62WQ8rHbxsaipDepq2NWJ1jsFQVrB0KuJFU3xLZETe7V3c68VA26 T3r7k8JmHO/E/XBkAwPsoyRg3eCbwK+Bql9K41eYhHpHL7yGMxs+JMP/mjMrvJJ5zoHg LqRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=6LQ2gHRNqUiYNDnXCgybcjiLwRKZv05WXYOXy4P5J3Q=; b=e3NowixGsTt3d9ZtZlP8DwoQFtPm3C0tCD5kHv/YxChZECalUEvOIHZ198CRR2+eUg w41sY/81JZE+6k2zSbwcjgH6j0yI23S9wfwyxmyeaY4nnTGrxlY7o+4ZdxEkz5WzLN7e wYPbboNErZULcw1iohikK+0SVjhaMDNZcvYlB9Wth2t1lUZi2d1nenY3Q/2H/0qcfisn y0Q4wQhqG/rBmPCxyDPe7KjRffIXGIC2S8xL4gPXuG9K3WphvJJ1czxMevbmNW0kiIR2 fujCXaILdCcoFL0wjMtvpR1Ejvb4FkkD14hHrubmPkkLvUF4/s7+rIfXiFXthB2NxuMJ UhWA== X-Gm-Message-State: AMke39k8EB5MeT+lvMUR++uNkj83rv/F4tTJvKpG7+j9Z+yxFDFrvu+Vd4WgMR3cbZ1S9Q== X-Received: by 10.28.222.11 with SMTP id v11mr4694154wmg.1.1487102862993; Tue, 14 Feb 2017 12:07:42 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:9533:a20:55f1:fb4b? (p200300C6EBDC400095330A2055F1FB4B.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:9533:a20:55f1:fb4b]) by smtp.googlemail.com with ESMTPSA id w204sm2535783wmd.17.2017.02.14.12.07.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 12:07:42 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 10/18] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host To: Ulf Hansson , Kevin Hilman References: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Cc: Carlo Caione , "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: <29e26eba-ef27-1ee2-97f1-aeca3cfc76a5@gmail.com> Date: Tue, 14 Feb 2017 21:06:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> 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 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 Acked-by: Kevin Hilman --- drivers/mmc/host/meson-gx-mmc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 1a76c925..159ee7b4 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -128,8 +128,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; @@ -696,7 +694,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) @@ -728,8 +726,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; @@ -757,7 +755,7 @@ 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, + ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq, meson_mmc_irq_thread, IRQF_SHARED, dev_name(&pdev->dev), host); if (ret)