All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Kevin Hilman <khilman@baylibre.com>
Cc: Carlo Caione <carlo@caione.org>,
	"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
	linux-amlogic@lists.infradead.org
Subject: [PATCH 10/18] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host
Date: Tue, 14 Feb 2017 21:06:44 +0100	[thread overview]
Message-ID: <29e26eba-ef27-1ee2-97f1-aeca3cfc76a5@gmail.com> (raw)
In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com>

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 <hkallweit1@gmail.com>
---
 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)
-- 
2.11.1



WARNING: multiple messages have this Message-ID (diff)
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 10/18] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host
Date: Tue, 14 Feb 2017 21:06:44 +0100	[thread overview]
Message-ID: <29e26eba-ef27-1ee2-97f1-aeca3cfc76a5@gmail.com> (raw)
In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com>

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 <hkallweit1@gmail.com>
---
 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)
-- 
2.11.1

  parent reply	other threads:[~2017-02-14 20:07 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com>
2017-02-14 20:05 ` [PATCH 01/18] mmc: meson-gx: set segment host parameters Heiner Kallweit
2017-02-14 20:05   ` Heiner Kallweit
2017-02-14 20:05 ` [PATCH 02/18] mmc: meson-gx: remove code for unsupported CMD23 Heiner Kallweit
2017-02-14 20:05   ` Heiner Kallweit
2017-02-15 16:54   ` Kevin Hilman
2017-02-15 16:54     ` Kevin Hilman
2017-02-16  7:03     ` Heiner Kallweit
2017-02-16  7:03       ` Heiner Kallweit
2017-02-16  8:14       ` Ulf Hansson
2017-02-16  8:14         ` Ulf Hansson
2017-02-16 17:49         ` Heiner Kallweit
2017-02-16 17:49           ` Heiner Kallweit
2017-02-19 19:36     ` Heiner Kallweit
2017-02-19 19:36       ` Heiner Kallweit
2017-02-14 20:06 ` [PATCH 03/18] mmc: meson-gx: explicitely call stop command for multi-block commands only Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-14 20:06 ` [PATCH 04/18] mmc: meson-gx: improve meson_mmc_start_cmd Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 17:04   ` Kevin Hilman
2017-02-15 17:04     ` Kevin Hilman
2017-02-15 19:43     ` Heiner Kallweit
2017-02-15 19:43       ` Heiner Kallweit
2017-02-15 21:10       ` Heiner Kallweit
2017-02-15 21:10         ` Heiner Kallweit
2017-02-15 23:58         ` Kevin Hilman
2017-02-15 23:58           ` Kevin Hilman
2017-02-19 19:41     ` Heiner Kallweit
2017-02-19 19:41       ` Heiner Kallweit
2017-02-14 20:06 ` [PATCH 05/18] mmc: meson-gx: eliminate struct sd_emmc_data Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 17:09   ` Kevin Hilman
2017-02-15 17:09     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 06/18] mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 17:14   ` Kevin Hilman
2017-02-15 17:14     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 07/18] mmc: meson-gx: check return value of sg_copy_[from,to]_buffer Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 17:17   ` Kevin Hilman
2017-02-15 17:17     ` [PATCH 07/18] mmc: meson-gx: check return value of sg_copy_[from, to]_buffer Kevin Hilman
2017-02-14 20:06 ` [PATCH 08/18] mmc: meson-gx: make two functions return void Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 17:18   ` Kevin Hilman
2017-02-15 17:18     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 09/18] mmc: meson-gx: change interrupt name Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 12:34   ` Ben Dooks
2017-02-15 12:34     ` Ben Dooks
2017-02-15 19:46     ` Heiner Kallweit
2017-02-15 19:46       ` Heiner Kallweit
2017-02-15 17:18   ` Kevin Hilman
2017-02-15 17:18     ` Kevin Hilman
2017-02-14 20:06 ` Heiner Kallweit [this message]
2017-02-14 20:06   ` [PATCH 10/18] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host Heiner Kallweit
2017-02-15 17:19   ` Kevin Hilman
2017-02-15 17:19     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 11/18] mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 19:24   ` Kevin Hilman
2017-02-15 19:24     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 12/18] mmc: meson-gx: remove member parent_mux from struct meson_host Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 19:25   ` Kevin Hilman
2017-02-15 19:25     ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 13/18] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init Heiner Kallweit
2017-02-14 20:06   ` Heiner Kallweit
2017-02-15 19:27   ` Kevin Hilman
2017-02-15 19:27     ` Kevin Hilman
2017-02-15 19:38     ` Heiner Kallweit
2017-02-15 19:38       ` Heiner Kallweit
2017-02-15 23:56       ` Kevin Hilman
2017-02-15 23:56         ` Kevin Hilman
2017-02-16  7:05         ` Heiner Kallweit
2017-02-16  7:05           ` Heiner Kallweit
2017-02-14 20:07 ` [PATCH 14/18] mmc: meson-gx: remove unneeded devm_kstrdup " Heiner Kallweit
2017-02-14 20:07   ` Heiner Kallweit
2017-02-15 19:30   ` Kevin Hilman
2017-02-15 19:30     ` Kevin Hilman
2017-02-15 19:35     ` Heiner Kallweit
2017-02-15 19:35       ` Heiner Kallweit
2017-02-14 20:07 ` [PATCH 15/18] mmc: meson-gx: improve initial configuration Heiner Kallweit
2017-02-14 20:07   ` Heiner Kallweit
2017-02-15 19:32   ` Kevin Hilman
2017-02-15 19:32     ` Kevin Hilman
2017-02-14 20:07 ` [PATCH 16/18] mmc: meson-gx: improve response reading and sending stop command Heiner Kallweit
2017-02-14 20:07   ` Heiner Kallweit
2017-02-15 19:34   ` Kevin Hilman
2017-02-15 19:34     ` Kevin Hilman
2017-02-14 20:07 ` [PATCH 17/18] mmc: meson-gx: remove member mrq from struct meson_host Heiner Kallweit
2017-02-14 20:07   ` Heiner Kallweit
2017-02-15 19:36   ` Kevin Hilman
2017-02-15 19:36     ` Kevin Hilman
2017-02-14 20:07 ` [PATCH 18/18] mmc: meson-gx: move handling of one case from threaded handler to main irq Heiner Kallweit
2017-02-14 20:07   ` Heiner Kallweit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=29e26eba-ef27-1ee2-97f1-aeca3cfc76a5@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=carlo@caione.org \
    --cc=khilman@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.