From patchwork Fri Mar 3 19:53:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9603421 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 CE3EC60414 for ; Fri, 3 Mar 2017 20:00:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0D2F28631 for ; Fri, 3 Mar 2017 20:00:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5E1F28633; Fri, 3 Mar 2017 20:00:44 +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 67AD228631 for ; Fri, 3 Mar 2017 20:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752027AbdCCUAo (ORCPT ); Fri, 3 Mar 2017 15:00:44 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34128 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbdCCUAn (ORCPT ); Fri, 3 Mar 2017 15:00:43 -0500 Received: by mail-wr0-f195.google.com with SMTP id u48so14550872wrc.1 for ; Fri, 03 Mar 2017 12:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=80vlnTDvrbuVe2Yw/lty8EOBIwJTU6DHjfX5iRmoInk=; b=PR+EJKzH73Gnca+3r7P7DPVF+z5x1ep7lEjS9v35ml5A2qe5i4IeqPSmdpW/SDt7qk wA/UzuGCdW6klpJktUNm/IyAynKKcO330eNuxBkxXIBsg0tJEJLsFBTWdaUoDaSQviYT KTEmBJxHz5te/HzweNh50kR1JOflGUqiLtWsoE3O3MsycspIw9GftjBzPuSCbJsK+OPc Q98o+crpLGwh8uior3LKmAUloZAJbZ+bQUODGWHKkwN7Yai+pq23nM9PWmKwHn3Ulvx+ Nql86aZqqbeWumnDQ+zOB6gbQv8nOLwCNtTNVu4Vh9ztIra+tpMIiJAckzPFUiLv9e+Y Sjeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=80vlnTDvrbuVe2Yw/lty8EOBIwJTU6DHjfX5iRmoInk=; b=os2K/5+lOCvEVYDvqkDq15wuEzOPtuEetdjhztlCXpX5tLV0EOEMQubOKXXmNyihoa 0TzhuqpJONGEGTmEN+C5UwDx7f6x5gUEi83BoiQ+oaIUAX+Nqr8SKdW65Y69htIKX12s T9/qpUZGfIEj8Fyz9Hb0jh2iH3h8K9rys/Tz4azcYKk+wZpp6F5xxmqZK1GzaxQ739M1 vr7l8q8Xh321lXgErMiA9gI1zZVHMc3D5hyTNgISA7fmMI0qQVlxz3N+Z25cyMisMCxj AGAa4Sh6xGD2Dm/Rqk3M4pJFLI8nw7fSy5Sr70B7JaV2fGgiXqev4yr7M/EJoClqN5MG VciQ== X-Gm-Message-State: AMke39lDN9wML0uol0D4yKxSMSY0FsMWFy1TqtLQk3TH61ylTTcGRKRORHjkwZFM7EEM0w== X-Received: by 10.223.130.214 with SMTP id 80mr4406356wrc.43.1488571241819; Fri, 03 Mar 2017 12:00:41 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:f903:fe11:afad:80a0? (p200300C6EBDC4000F903FE11AFAD80A0.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:f903:fe11:afad:80a0]) by smtp.googlemail.com with ESMTPSA id y69sm16403822wrc.69.2017.03.03.12.00.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 12:00:41 -0800 (PST) Subject: [PATCH v4 3/10] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host To: Ulf Hansson , Kevin Hilman References: <62912f3d-2307-cfff-3c69-c8b8ffaeb474@gmail.com> Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: Date: Fri, 3 Mar 2017 20:53:38 +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: <62912f3d-2307-cfff-3c69-c8b8ffaeb474@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 --- v2: - added acked-by v3: - no changes v4: - no changes --- drivers/mmc/host/meson-gx-mmc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index b99461ff..b9de3d47 100644 --- 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;