All of lore.kernel.org
 help / color / mirror / Atom feed
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v2 4/9] mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init
Date: Thu, 16 Feb 2017 20:41:30 +0100	[thread overview]
Message-ID: <2bb20447-d932-0ffe-e976-ca16d28154dd@gmail.com> (raw)
In-Reply-To: <7d5263e2-9325-dedb-a5f6-954c4a09e977@gmail.com>

Because the DT requires a fixed number of mux parent clocks,
variable mux_parent_count can be replaced with constant
MUX_CLK_NUM_PARENTS, so remove it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
---
v2:
- adjusted commit message
- added acked-by
---
 drivers/mmc/host/meson-gx-mmc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index b9de3d47..ea2db3ce 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -242,7 +242,6 @@ static int meson_mmc_clk_init(struct meson_host *host)
 	char clk_name[32];
 	int i, ret = 0;
 	const char *mux_parent_names[MUX_CLK_NUM_PARENTS];
-	unsigned int mux_parent_count = 0;
 	const char *clk_div_parents[1];
 	u32 clk_reg, cfg;
 
@@ -261,7 +260,6 @@ static int meson_mmc_clk_init(struct meson_host *host)
 		}
 
 		mux_parent_names[i] = __clk_get_name(host->mux_parent[i]);
-		mux_parent_count++;
 	}
 
 	/* create the mux */
@@ -270,7 +268,7 @@ static int meson_mmc_clk_init(struct meson_host *host)
 	init.ops = &clk_mux_ops;
 	init.flags = 0;
 	init.parent_names = mux_parent_names;
-	init.num_parents = mux_parent_count;
+	init.num_parents = MUX_CLK_NUM_PARENTS;
 
 	host->mux.reg = host->regs + SD_EMMC_CLOCK;
 	host->mux.shift = CLK_SRC_SHIFT;
-- 
2.11.1

WARNING: multiple messages have this Message-ID (diff)
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Kevin Hilman <khilman@baylibre.com>
Cc: "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
	linux-amlogic@lists.infradead.org
Subject: [PATCH v2 4/9] mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init
Date: Thu, 16 Feb 2017 20:41:30 +0100	[thread overview]
Message-ID: <2bb20447-d932-0ffe-e976-ca16d28154dd@gmail.com> (raw)
In-Reply-To: <7d5263e2-9325-dedb-a5f6-954c4a09e977@gmail.com>

Because the DT requires a fixed number of mux parent clocks,
variable mux_parent_count can be replaced with constant
MUX_CLK_NUM_PARENTS, so remove it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
---
v2:
- adjusted commit message
- added acked-by
---
 drivers/mmc/host/meson-gx-mmc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index b9de3d47..ea2db3ce 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -242,7 +242,6 @@ static int meson_mmc_clk_init(struct meson_host *host)
 	char clk_name[32];
 	int i, ret = 0;
 	const char *mux_parent_names[MUX_CLK_NUM_PARENTS];
-	unsigned int mux_parent_count = 0;
 	const char *clk_div_parents[1];
 	u32 clk_reg, cfg;
 
@@ -261,7 +260,6 @@ static int meson_mmc_clk_init(struct meson_host *host)
 		}
 
 		mux_parent_names[i] = __clk_get_name(host->mux_parent[i]);
-		mux_parent_count++;
 	}
 
 	/* create the mux */
@@ -270,7 +268,7 @@ static int meson_mmc_clk_init(struct meson_host *host)
 	init.ops = &clk_mux_ops;
 	init.flags = 0;
 	init.parent_names = mux_parent_names;
-	init.num_parents = mux_parent_count;
+	init.num_parents = MUX_CLK_NUM_PARENTS;
 
 	host->mux.reg = host->regs + SD_EMMC_CLOCK;
 	host->mux.shift = CLK_SRC_SHIFT;
-- 
2.11.1



  parent reply	other threads:[~2017-02-16 19:41 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <7d5263e2-9325-dedb-a5f6-954c4a09e977@gmail.com>
2017-02-16 19:40 ` [PATCH v2 1/9] mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd Heiner Kallweit
2017-02-16 19:40   ` Heiner Kallweit
2017-02-16 19:41 ` [PATCH v2 2/9] mmc: meson-gx: make two functions return void Heiner Kallweit
2017-02-16 19:41   ` Heiner Kallweit
2017-02-16 19:41 ` [PATCH v2 3/9] mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host Heiner Kallweit
2017-02-16 19:41   ` Heiner Kallweit
2017-02-16 19:41 ` Heiner Kallweit [this message]
2017-02-16 19:41   ` [PATCH v2 4/9] mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init Heiner Kallweit
2017-02-16 19:41 ` [PATCH v2 5/9] mmc: meson-gx: remove member parent_mux from struct meson_host Heiner Kallweit
2017-02-16 19:41   ` Heiner Kallweit
2017-02-16 19:42 ` [PATCH v2 6/9] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init Heiner Kallweit
2017-02-16 19:42   ` Heiner Kallweit
2017-02-17 19:51   ` Kevin Hilman
2017-02-17 19:51     ` Kevin Hilman
2017-02-18  3:44   ` Michał Zegan
2017-02-18  3:44     ` Michał Zegan
2017-02-18 10:37     ` Heiner Kallweit
2017-02-18 10:49       ` Heiner Kallweit
2017-02-18 10:49         ` Heiner Kallweit
2017-02-18 11:26       ` Michał Zegan
2017-02-18 11:26         ` Michał Zegan
2017-02-16 19:42 ` [PATCH v2 7/9] mmc: meson-gx: remove unneeded devm_kstrdup " Heiner Kallweit
2017-02-16 19:42   ` Heiner Kallweit
2017-02-16 19:42 ` [PATCH v2 8/9] mmc: meson-gx: improve initial configuration Heiner Kallweit
2017-02-16 19:42   ` Heiner Kallweit
2017-02-16 19:42 ` [PATCH v2 9/9] mmc: meson-gx: remove member mrq from struct meson_host Heiner Kallweit
2017-02-16 19:42   ` 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=2bb20447-d932-0ffe-e976-ca16d28154dd@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=linus-amlogic@lists.infradead.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.