[PATCH] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently

[PATCH] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently

[Peter Griffin]

.set_uhs_signaling field is currently initialised twice once to the
arch specific callback pxav3_set_uhs_signaling, and also to the generic
sdhci_set_uhs_signaling callback.

This means that uhs is currently broken for this platform currently, as pxav3
has some special constriants which means it can't use the generic callback.

This happened in
commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function")
commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")'

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 drivers/mmc/host/sdhci-pxav3.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 6f842fb..3f350ea 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -229,7 +229,6 @@ static const struct sdhci_ops pxav3_sdhci_ops = {
 	.get_max_clock = sdhci_pltfm_clk_get_max_clock,
 	.set_bus_width = sdhci_set_bus_width,
 	.reset = pxav3_reset,
-	.set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
 static struct sdhci_pltfm_data sdhci_pxav3_pdata = {
-- 
1.9.1

Re: [PATCH] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently

[Russell King - ARM Linux]

On Fri, Aug 15, 2014 at 10:12:38AM +0100, Peter Griffin wrote:
> .set_uhs_signaling field is currently initialised twice once to the
> arch specific callback pxav3_set_uhs_signaling, and also to the generic
> sdhci_set_uhs_signaling callback.
> 
> This means that uhs is currently broken for this platform currently, as pxav3
> has some special constriants which means it can't use the generic callback.
> 
> This happened in
> commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function")
> commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")'

This is exactly why named initialisers should always follow the
declaration order in the structure definition.

It also helps avoid git merge to properly resolve two additions of
the same member (possibly with a conflict) rather than just adding
both.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

Re: [PATCH] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently

[Peter Griffin]

Hi Russell,

> > This happened in
> > commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function")
> > commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")'
> 
> This is exactly why named initialisers should always follow the
> declaration order in the structure definition.
> 
> It also helps avoid git merge to properly resolve two additions of
> the same member (possibly with a conflict) rather than just adding
> both.

Ah yes that makes a lot of sense. I will send a V2 in a moment, as the line I
removed now means that it's not in order with the structure definition.

regards,

Peter.