mmc: sdhci: remove the unused argument for sdhci_setup_cfg

Some arguments don't need to pass to sdhci_setup_cfg. Generic variable can be used in sdhci_setup_cfg, and some arguments are already included in sdhci_host struct.

It's enough that just pass the board specific things to sdhci_setup_cfg(). After removing the unnecessary arguments, it's more simpler than before. It doesn't consider "Version" and "Capabilities" anymore in each SoC driver.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  |  4 +---
 drivers/mmc/sdhci.c      | 28 +++++++++++++++-------------
 drivers/mmc/zynq_sdhci.c |  9 ++-------
 include/sdhci.h          | 12 +++---------
 4 files changed, 21 insertions(+), 32 deletions(-)

Quoted 9 lines · Jaehoon Chung

Some arguments don't need to pass to sdhci_setup_cfg. Generic variable can be used in sdhci_setup_cfg, and some arguments are already included in sdhci_host struct.

It's enough that just pass the board specific things to sdhci_setup_cfg(). After removing the unnecessary arguments, it's more simpler than before. It doesn't consider "Version" and "Capabilities" anymore in each SoC driver.

Quoted 7 lines

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  |  4 +---
 drivers/mmc/sdhci.c      | 28 +++++++++++++++-------------
 drivers/mmc/zynq_sdhci.c |  9 ++-------
 include/sdhci.h          | 12 +++---------
 4 files changed, 21 insertions(+), 32 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Quoted 18 lines · Simon Glass

Quoted 16 lines · Jaehoon Chung

Some arguments don't need to pass to sdhci_setup_cfg. Generic variable can be used in sdhci_setup_cfg, and some arguments are already included in sdhci_host struct.

It's enough that just pass the board specific things to sdhci_setup_cfg(). After removing the unnecessary arguments, it's more simpler than before. It doesn't consider "Version" and "Capabilities" anymore in each SoC driver.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  |  4 +---
 drivers/mmc/sdhci.c      | 28 +++++++++++++++-------------
 drivers/mmc/zynq_sdhci.c |  9 ++-------
 include/sdhci.h          | 12 +++---------
 4 files changed, 21 insertions(+), 32 deletions(-)

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

If you are applying this, can you please fix the typo in the subject?

- Simon

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

drivers/mmc/msm_sdhci.c +2 -2

index 70a8d96..e90a044 100644
@@ -144,8 +144,8 @@ static int msm_sdc_probe(struct udevice *dev)
 	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
 
 	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
-			      caps, 0, 0, host->version, host->quirks, 0);
+	ret = sdhci_setup_cfg(&plat->cfg, dev->name, caps,
+			0, 0, host->version, host->quirks, 0);
 	host->mmc = &plat->mmc;
 	if (ret)
 		return ret;

drivers/mmc/sdhci.c +2 -2

index de8d8ea..d8cd75f 100644
@@ -510,7 +510,7 @@ static const struct mmc_ops sdhci_ops = {
 };
 #endif
 
-int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
+int sdhci_setup_cfg(struct mmc_config *cfg, const char *name,
 		    uint caps, u32 max_clk, u32 min_clk, uint version,
 		    uint quirks, uint host_caps)
 {

@@ -584,7 +584,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
 	}
 #endif
 
-	if (sdhci_setup_cfg(&host->cfg, host->name, host->bus_width, caps,
+	if (sdhci_setup_cfg(&host->cfg, host->name, caps,
 			    max_clk, min_clk, SDHCI_GET_VERSION(host),
 			    host->quirks, host->host_caps)) {
 		printf("%s: Hardware doesn't specify base clock frequency\n",

drivers/mmc/zynq_sdhci.c +1 -1

index bcd154a..69d6151 100644
@@ -40,7 +40,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
 
 	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
+	ret = sdhci_setup_cfg(&plat->cfg, dev->name,
 			      caps, CONFIG_ZYNQ_SDHCI_MAX_FREQ,
 			      CONFIG_ZYNQ_SDHCI_MIN_FREQ, host->version,
 			      host->quirks, 0);

include/sdhci.h +0 -1

index c4d3b55..693ecc1 100644
@@ -368,7 +368,6 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
  *
  * @cfg:	Configuration structure to fill in (generally &plat->mmc)
  * @name:	Device name (normally dev->name)
- * @buswidth:	Bus width (in bits, such as 4 or 8)
  * @caps:	Host capabilities (MMC_MODE_...)
  * @max_clk:	Maximum supported clock speed in HZ (0 for default)
  * @min_clk:	Minimum supported clock speed in HZ (0 for default)

Hi,

Quoted 74 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

drivers/mmc/msm_sdhci.c +2 -2

index 70a8d96..e90a044 100644
@@ -144,8 +144,8 @@ static int msm_sdc_probe(struct udevice *dev)
 	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
 
 	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
-			      caps, 0, 0, host->version, host->quirks, 0);
+	ret = sdhci_setup_cfg(&plat->cfg, dev->name, caps,
+			0, 0, host->version, host->quirks, 0);
 	host->mmc = &plat->mmc;
 	if (ret)
 		return ret;

drivers/mmc/sdhci.c +2 -2

index de8d8ea..d8cd75f 100644
@@ -510,7 +510,7 @@ static const struct mmc_ops sdhci_ops = {
 };
 #endif
 
-int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
+int sdhci_setup_cfg(struct mmc_config *cfg, const char *name,
 		    uint caps, u32 max_clk, u32 min_clk, uint version,
 		    uint quirks, uint host_caps)
 {

@@ -584,7 +584,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
 	}
 #endif
 
-	if (sdhci_setup_cfg(&host->cfg, host->name, host->bus_width, caps,
+	if (sdhci_setup_cfg(&host->cfg, host->name, caps,
 			    max_clk, min_clk, SDHCI_GET_VERSION(host),
 			    host->quirks, host->host_caps)) {
 		printf("%s: Hardware doesn't specify base clock frequency\n",

drivers/mmc/zynq_sdhci.c +1 -1

index bcd154a..69d6151 100644
@@ -40,7 +40,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
 	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
 
 	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
+	ret = sdhci_setup_cfg(&plat->cfg, dev->name,
 			      caps, CONFIG_ZYNQ_SDHCI_MAX_FREQ,
 			      CONFIG_ZYNQ_SDHCI_MIN_FREQ, host->version,
 			      host->quirks, 0);

include/sdhci.h +0 -1

index c4d3b55..693ecc1 100644
@@ -368,7 +368,6 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
  *
  * @cfg:	Configuration structure to fill in (generally &plat->mmc)
  * @name:	Device name (normally dev->name)
- * @buswidth:	Bus width (in bits, such as 4 or 8)
  * @caps:	Host capabilities (MMC_MODE_...)
  * @max_clk:	Maximum supported clock speed in HZ (0 for default)
  * @min_clk:	Minimum supported clock speed in HZ (0 for default)

include/sdhci.h static inline u8 sdhci_readb(struct sdhci_host *host, int reg) · line 382

Quoted 8 lines

include/sdhci.h +1 -1

@@ -377,7 +376,7 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
  * @quirks:	Quick flags (SDHCI_QUIRK_...)
  * @host_caps:	Additional host capabilities (0 if none)
  */
-int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
+int sdhci_setup_cfg(struct mmc_config *cfg, const char *name,
 		    uint caps, u32 max_clk, u32 min_clk, uint version,
 		    uint quirks, uint host_caps);
 

looks good to me.

Reviewed-by Minkyu Kang <[email protected]>

but, this may make conflict with your patch (http://patchwork.ozlabs.org/patch/651179/)
What patch will apply first?
Please let me know.

Thanks,
Minkyu Kang.

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Quoted 9 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Hi Jaehoon,

Quoted 11 lines · Simon Glass

Quoted 9 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

Are you going to pick this up? I suggest that it goes in now since it will affect people porting drivers.

Regards,
Simon

Hi Simon,

Quoted 14 lines · Simon Glass

Hi Jaehoon,

Quoted 11 lines · Simon Glass

Quoted 9 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Quoted 4 lines

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

Are you going to pick this up? I suggest that it goes in now since it will affect people porting drivers.

I think it's related with DM side. So if you can pick this, I'm ok. Otherwise, i will apply on u-boot-mmc, today..And tomorrow i will request pull.

Hi Jaehoon,

Quoted 19 lines · Jaehoon Chung

Hi Simon,

Quoted 16 lines · Simon Glass

Hi Jaehoon,

Quoted 12 lines · Simon Glass

Quoted 9 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Quoted 5 lines

Quoted 2 lines

Are you going to pick this up? I suggest that it goes in now since it will affect people porting drivers.

I think it's related with DM side. So if you can pick this, I'm ok. Otherwise, i will apply on u-boot-mmc, today..And tomorrow i will request pull.

Yes it is DM-related, but if you don't mind I think it would be good for you to pick these up.

Regards,
Simon

Quoted 25 lines · Simon Glass

Hi Jaehoon,

Quoted 22 lines · Jaehoon Chung

Hi Simon,

Quoted 18 lines · Simon Glass

Hi Jaehoon,

Quoted 11 lines · Simon Glass

Quoted 9 lines · Jaehoon Chung

buswidth isn't used anywhere in sdhci_setup_cfg.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/msm_sdhci.c  | 4 ++--
 drivers/mmc/sdhci.c      | 4 ++--
 drivers/mmc/zynq_sdhci.c | 2 +-
 include/sdhci.h          | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

Are you going to pick this up? I suggest that it goes in now since it will affect people porting drivers.

Quoted 5 lines

Quoted 2 lines

I think it's related with DM side. So if you can pick this, I'm ok. Otherwise, i will apply on u-boot-mmc, today..And tomorrow i will request pull.

Yes it is DM-related, but if you don't mind I think it would be good for you to pick these up.

Ok, I will do. And tomorrow, I will request pull to Tom for u-boot-mmc with other mmc patches. How about?