From patchwork Sat Mar 4 12:21:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9603907 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 7E9BC604E2 for ; Sat, 4 Mar 2017 12:39:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F0442843F for ; Sat, 4 Mar 2017 12:39:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63F2628497; Sat, 4 Mar 2017 12:39:01 +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 15DED28555 for ; Sat, 4 Mar 2017 12:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbdCDMjA (ORCPT ); Sat, 4 Mar 2017 07:39:00 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36391 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbdCDMi5 (ORCPT ); Sat, 4 Mar 2017 07:38:57 -0500 Received: by mail-wm0-f67.google.com with SMTP id v190so6831220wme.3 for ; Sat, 04 Mar 2017 04:38:16 -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=OTgZX/iVWb2AoOwH4XQ+2LP4a3ww5QGP4N3TsgObPJk=; b=grFQJRFpwbTQXT/BZiKvGjywNpIYcKLLNHBYP7jilQmeKl68CpiR+ABgPqaQU8Sx/t OBV+sazn5WkR8Wblfgw7NhRJegyq0SX0/O1esyP/b3C5DxxAupbWbcZe+5w9+Y+gW7f5 i4+sEcygAUQqwcGc8IZ7kk+ELCyft7V90VVo7VDiwPYUIfn/53yrpR/ejhZQopZhFBZW DqvXsHJEtAZQ7SqR9nRKfbLlsL232Z8PHySP90IeAg5gHPH6lkwIe6AIJ5NbbmRggHWG q4P+dx0L4A8xidWdLrWgg2at0/eFUAyX9Q+SXTLH7i5vo65eoqTPR8Euo1dasc/1ez3K 1sLg== 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=OTgZX/iVWb2AoOwH4XQ+2LP4a3ww5QGP4N3TsgObPJk=; b=W6S1hOQPB5PuoAyh9XL7IvdC5G6gK58S+ekXip7LC9JmYqsQh5DkywphWvYPlnbdZF pgMsnnj7qq++Jaf20vyFxA5a6Ae7S1OkGgvhmSgWwPL0n5HuJEtUpnCU/ZDV3BA+Q+o0 PWto5HuAaQXOJNAdnSfNHXEWsLODZyhx/59Y/vDhcvIQUF+Mt3iNCWYwdLbxjt+3KrmL FyL+SBchuMQero/+YHphCYzN51MQyf9WdQUR/CZVryJi3Cgngaaaybqn5MlqcU9wI3IU 7DBcMJTkEymS4Gm5FaAOwQ2i71xzLGf9qyL/VGAdXJSit0xGXcRRBwb+gnT6An8lLOfy N2+g== X-Gm-Message-State: AMke39n4nWOycO9lTAqflFhZW1p2gHJK081Jv3JJzcr6zXE93MOsSMytMP3x3k9U9y7r5Q== X-Received: by 10.28.140.140 with SMTP id o134mr7171870wmd.87.1488631095846; Sat, 04 Mar 2017 04:38:15 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:98cd:c51c:6f4e:443? (p200300C6EBDC400098CDC51C6F4E0443.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:98cd:c51c:6f4e:443]) by smtp.googlemail.com with ESMTPSA id r82sm6908793wmd.32.2017.03.04.04.38.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 04:38:15 -0800 (PST) Subject: [PATCH v5 3/10] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host To: Ulf Hansson , Kevin Hilman References: Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <713d2aba-76b6-b47d-60d1-1e90d629c292@gmail.com> Date: Sat, 4 Mar 2017 13:21:54 +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: 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 v5: - 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;