Commit b3153765 authored Aug 15, 2014 by Peter Griffin Committed by Ulf Hansson Sep 09, 2014

mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently



.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 96d7b78c ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function")
commit a702c8ab ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")'

Fix this and hopefully prevent it happening in the future by ensuring named
initialisers always follow the declaration order in the structure definition.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <stable@vger.kernel.org> # v3.16+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 1d75f74b

drivers/mmc/host/sdhci-pxav3.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -224,12 +224,11 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)

		static const struct sdhci_ops pxav3_sdhci_ops = {
		.set_clock = sdhci_set_clock,
		.set_uhs_signaling = pxav3_set_uhs_signaling,
		.platform_send_init_74_clocks = pxav3_gen_init_74_clocks,
		.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,
		.set_uhs_signaling = pxav3_set_uhs_signaling,
		};

		static struct sdhci_pltfm_data sdhci_pxav3_pdata = {

Admin message