mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 12/18] mmc: meson-gx: remove member parent_mux from struct meson_host
Date: Tue, 14 Feb 2017 21:06:53 +0100	[thread overview]
Message-ID: <ef34f765-cb48-9381-4a0c-e6f540612ea6@gmail.com> (raw)
In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com>

Member mux_parent isn't used outside meson_mmc_clk_init. So remove it
and replace it with a local variable in meson_mmc_clk_init.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 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 d05ffe8a..74ceda75 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -131,7 +131,6 @@ struct meson_host {
 	struct clk *core_clk;
 	struct clk_mux mux;
 	struct clk *mux_clk;
-	struct clk *mux_parent[MUX_CLK_NUM_PARENTS];
 	unsigned long current_clock;
 
 	struct clk_divider cfg_div;
@@ -242,19 +241,18 @@ static int meson_mmc_clk_init(struct meson_host *host)
 
 	/* get the mux parents */
 	for (i = 0; i < MUX_CLK_NUM_PARENTS; i++) {
+		struct clk *clk;
 		char name[16];
 
 		snprintf(name, sizeof(name), "clkin%d", i);
-		host->mux_parent[i] = devm_clk_get(host->dev, name);
-		if (IS_ERR(host->mux_parent[i])) {
-			ret = PTR_ERR(host->mux_parent[i]);
-			if (PTR_ERR(host->mux_parent[i]) != -EPROBE_DEFER)
+		clk = devm_clk_get(host->dev, name);
+		if (IS_ERR(clk)) {
+			if (clk != ERR_PTR(-EPROBE_DEFER))
 				dev_err(host->dev, "Missing clock %s\n", name);
-			host->mux_parent[i] = NULL;
-			return ret;
+			return PTR_ERR(clk);
 		}
 
-		mux_parent_names[i] = __clk_get_name(host->mux_parent[i]);
+		mux_parent_names[i] = __clk_get_name(clk);
 	}
 
 	/* create the mux */
-- 
2.11.1

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

Thread overview: 47+ 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 ` [PATCH 02/18] mmc: meson-gx: remove code for unsupported CMD23 Heiner Kallweit
2017-02-15 16:54   ` Kevin Hilman
2017-02-16  7:03     ` Heiner Kallweit
2017-02-16  8:14       ` Ulf Hansson
2017-02-16 17:49         ` 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 ` [PATCH 04/18] mmc: meson-gx: improve meson_mmc_start_cmd Heiner Kallweit
2017-02-15 17:04   ` Kevin Hilman
2017-02-15 19:43     ` Heiner Kallweit
2017-02-15 21:10       ` Heiner Kallweit
2017-02-15 23:58         ` Kevin Hilman
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-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-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-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-15 17:18   ` Kevin Hilman
2017-02-14 20:06 ` [PATCH 09/18] mmc: meson-gx: change interrupt name Heiner Kallweit
2017-02-15 12:34   ` Ben Dooks
2017-02-15 19:46     ` Heiner Kallweit
2017-02-15 17:18   ` Kevin Hilman
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-14 20:06 ` [PATCH 11/18] mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init Heiner Kallweit
2017-02-15 19:24   ` Kevin Hilman
2017-02-14 20:06 ` Heiner Kallweit [this message]
2017-02-15 19:25   ` [PATCH 12/18] mmc: meson-gx: remove member parent_mux from struct meson_host 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-15 19:27   ` Kevin Hilman
2017-02-15 19:38     ` Heiner Kallweit
2017-02-15 23:56       ` Kevin Hilman
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-15 19:30   ` Kevin Hilman
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-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-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-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

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=ef34f765-cb48-9381-4a0c-e6f540612ea6@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®