All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dong Aisheng <aisheng.dong@freescale.com>
To: linux-mmc@vger.kernel.org
Cc: fabio.estevam@freescale.com, marex@denx.de,
	ulf.hansson@linaro.org, s.trumtrar@pengutronix.de, smoch@web.de,
	linux-arm-kernel@lists.infradead.org, robertcnelson@gmail.com,
	s.hauer@pengutronix.de, chris@printf.net, rabeeh@solid-run.com,
	troy.kisky@boundarydevices.com, lisovy@gmail.com, hs@denx.de,
	gwenhael.goavec-merou@armadeus.com, p.zabel@pengutronix.de,
	rmk+kernel@arm.linux.org.uk, shawn.guo@linaro.org,
	b29396@freescale.com, tharvey@gateworks.com,
	LW@KARO-electronics.de, ipaton0@gmail.com
Subject: [PATCH V2 10/11] mmc: sdhci-esdhc-imx: clear f_max in boarddata
Date: Wed, 22 Jul 2015 20:53:09 +0800	[thread overview]
Message-ID: <1437569590-5228-11-git-send-email-aisheng.dong@freescale.com> (raw)
In-Reply-To: <1437569590-5228-1-git-send-email-aisheng.dong@freescale.com>

After commit 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()"),
it's not used anymore.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c          | 7 +------
 include/linux/platform_data/mmc-esdhc-imx.h | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 1b0e618..c6b9f64 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -581,13 +581,8 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
 static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct pltfm_imx_data *imx_data = pltfm_host->priv;
-	struct esdhc_platform_data *boarddata = &imx_data->boarddata;
 
-	if (boarddata->f_max && (boarddata->f_max < pltfm_host->clock))
-		return boarddata->f_max;
-	else
-		return pltfm_host->clock;
+	return pltfm_host->clock;
 }
 
 static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index 75f70f6..e1571ef 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -43,7 +43,6 @@ struct esdhc_platform_data {
 	enum wp_types wp_type;
 	enum cd_types cd_type;
 	int max_bus_width;
-	unsigned int f_max;
 	bool support_vsel;
 	unsigned int delay_line;
 };
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: aisheng.dong@freescale.com (Dong Aisheng)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 10/11] mmc: sdhci-esdhc-imx: clear f_max in boarddata
Date: Wed, 22 Jul 2015 20:53:09 +0800	[thread overview]
Message-ID: <1437569590-5228-11-git-send-email-aisheng.dong@freescale.com> (raw)
In-Reply-To: <1437569590-5228-1-git-send-email-aisheng.dong@freescale.com>

After commit 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()"),
it's not used anymore.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c          | 7 +------
 include/linux/platform_data/mmc-esdhc-imx.h | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 1b0e618..c6b9f64 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -581,13 +581,8 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
 static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct pltfm_imx_data *imx_data = pltfm_host->priv;
-	struct esdhc_platform_data *boarddata = &imx_data->boarddata;
 
-	if (boarddata->f_max && (boarddata->f_max < pltfm_host->clock))
-		return boarddata->f_max;
-	else
-		return pltfm_host->clock;
+	return pltfm_host->clock;
 }
 
 static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index 75f70f6..e1571ef 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -43,7 +43,6 @@ struct esdhc_platform_data {
 	enum wp_types wp_type;
 	enum cd_types cd_type;
 	int max_bus_width;
-	unsigned int f_max;
 	bool support_vsel;
 	unsigned int delay_line;
 };
-- 
1.9.1

  parent reply	other threads:[~2015-07-22 14:03 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-22 12:52 [PATCH V2 00/11] mmc: sdhci-esdhci-imx: fix cd/wp regression Dong Aisheng
2015-07-22 12:52 ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 01/11] dts: imx51: fix sd card gpio polarity specified in device tree Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 02/11] dts: imx53: " Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 03/11] dts: imx6: " Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 04/11] dts: imx25: " Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 05/11] dts: imx7: " Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 06/11] mmc: sdhci-esdhc-imx: fix cd regression for dt platform Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-10-06 22:15   ` Stefan Agner
2015-10-06 22:15     ` Stefan Agner
2015-10-06 22:21     ` Fabio Estevam
2015-10-06 22:21       ` Fabio Estevam
2015-10-24 13:06       ` Fabio Estevam
2015-10-24 13:06         ` Fabio Estevam
2015-10-25 20:52         ` Robert Nelson
2015-10-25 20:52           ` Robert Nelson
2015-10-25 21:05           ` Fabio Estevam
2015-10-25 21:05             ` Fabio Estevam
2015-10-25 21:33             ` Robert Nelson
2015-10-25 21:33               ` Robert Nelson
2015-10-25 21:37               ` Fabio Estevam
2015-10-25 21:37                 ` Fabio Estevam
2015-11-11 15:16               ` Fabio Estevam
2015-11-11 15:16                 ` Fabio Estevam
2015-07-22 12:53 ` [PATCH V2 07/11] mmc: sdhci-esdhc-imx: move all non dt probe code into one function Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 08/11] mmc: sdhci: make max-frequency property in device tree work Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 09/11] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Dong Aisheng
2015-07-22 12:53   ` Dong Aisheng
2015-07-22 12:53 ` Dong Aisheng [this message]
2015-07-22 12:53   ` [PATCH V2 10/11] mmc: sdhci-esdhc-imx: clear f_max in boarddata Dong Aisheng
2015-07-22 12:53 ` [PATCH V2 11/11] dts: mmc: fsl-imx-esdhc: remove fsl,cd-controller support Dong Aisheng
2015-07-22 12:53   ` [PATCH V2 11/11] dts: mmc: fsl-imx-esdhc: remove fsl, cd-controller support Dong Aisheng
2015-07-23  4:45 ` [PATCH V2 00/11] mmc: sdhci-esdhci-imx: fix cd/wp regression Shawn Guo
2015-07-23  4:45   ` Shawn Guo
2015-07-23  9:11 ` Ulf Hansson
2015-07-23  9:11   ` Ulf Hansson

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=1437569590-5228-11-git-send-email-aisheng.dong@freescale.com \
    --to=aisheng.dong@freescale.com \
    --cc=LW@KARO-electronics.de \
    --cc=b29396@freescale.com \
    --cc=chris@printf.net \
    --cc=fabio.estevam@freescale.com \
    --cc=gwenhael.goavec-merou@armadeus.com \
    --cc=hs@denx.de \
    --cc=ipaton0@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=lisovy@gmail.com \
    --cc=marex@denx.de \
    --cc=p.zabel@pengutronix.de \
    --cc=rabeeh@solid-run.com \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=robertcnelson@gmail.com \
    --cc=s.hauer@pengutronix.de \
    --cc=s.trumtrar@pengutronix.de \
    --cc=shawn.guo@linaro.org \
    --cc=smoch@web.de \
    --cc=tharvey@gateworks.com \
    --cc=troy.kisky@boundarydevices.com \
    --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.