From patchwork Thu Feb 16 19:41:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9578233 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 9D63160209 for ; Thu, 16 Feb 2017 19:43:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91B0D2866A for ; Thu, 16 Feb 2017 19:43:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 868532866D; Thu, 16 Feb 2017 19:43:08 +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 37BB12866A for ; Thu, 16 Feb 2017 19:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933214AbdBPTnH (ORCPT ); Thu, 16 Feb 2017 14:43:07 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34044 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933224AbdBPTnG (ORCPT ); Thu, 16 Feb 2017 14:43:06 -0500 Received: by mail-wm0-f67.google.com with SMTP id c85so4696573wmi.1 for ; Thu, 16 Feb 2017 11:43:06 -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=704O3YoKIaplhKE8z++lZOEq7L45SpM3HY7WGs6dOYM=; b=F4dL76UdpLYACuVHTLCAYUWOjDWUiuNb20P+MPW8Zr0rp6ui801OkSDLuSs9IVzQkK vjTos5E/l7AQJrS4eqxmJr1dvQJpiuAnQwWrj7UMtU0/EYGi/Kn/SKFcWRavebcqGOPb ZnCSl+6pHrZgHQiNiniEiTpAM6JIR9lyBmCgl5xeWGx7l1h9oNVrElQcmqPZiw+GNScQ dj/T25d8TbufxqL4C7cqIi61lU8IP3pJf/0mdeFGG5VwhV/FGF8cfNkydZls8QdLhxMj UngMDZecLQbTpbMbpiWD2C8CUFhe9mGf7Mx0k/ULW2t2tNwoyQyo+msfYa22vuNiFi0n 2FXQ== 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=704O3YoKIaplhKE8z++lZOEq7L45SpM3HY7WGs6dOYM=; b=ayiHh4vbCkNGaeADUGFevePglvOGPfAwpTzXIWmpqn3DNHPzyVIlD4BaWpUNHEdxOb qzMn6nKSrs6xiw0ImPYHNia9zDF6ete8WK/Q0INdbzhg+cr6wQU2yfhFLcjKgTtIIs+a AoN1v5B1fJy1VrqjGBP0Hv7RK5Zkc8K5YtfmPFWCvtEm7H3i5x1xnf+9dD137NRVT7bF drXlwzrY0/JL8CVRLWGNMhVHBbk3FkmS3ZVuMyd4WgXy3QFCuU4GOQAv8mmLGw4WdjTe U20a2ihZTY8ZwwFYoJBuHuH8YmtbmWOUijxu9Zx4lfquwI6mt53Wb5sNMmKeL1AQjXVt WQ5A== X-Gm-Message-State: AMke39kDHhhlNiBAqk7Hvx/7+irhoDnK3/H4zV1PmAkiWvJd9m44m+jFa/mKOtUzCNLmGw== X-Received: by 10.28.103.69 with SMTP id b66mr3804084wmc.73.1487274185376; Thu, 16 Feb 2017 11:43:05 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:f02a:ffb3:d41d:abac? (p200300C6EBDC4000F02AFFB3D41DABAC.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:f02a:ffb3:d41d:abac]) by smtp.googlemail.com with ESMTPSA id i203sm1403089wmf.12.2017.02.16.11.43.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 11:43:04 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 3/9] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host To: Ulf Hansson , Kevin Hilman References: <7d5263e2-9325-dedb-a5f6-954c4a09e977@gmail.com> Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: <3115a01c-ea2e-9d75-7a8e-cb0c575130f6@gmail.com> Date: Thu, 16 Feb 2017 20:41:18 +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: <7d5263e2-9325-dedb-a5f6-954c4a09e977@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 --- 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;