| Message ID | b1a072bfd9f9d7934bef982e4a94734eccf0b8e4.1502310654.git.mirq-linux@rere.qmqm.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/08/17 23:36, Michał Mirosław wrote: > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> There always needs to be a commit message. i.e. "Now that sdhci_set_bus_width() supports 8-bit bus widths based on the MMC_CAP_8_BIT_DATA capability flag, replace the sdhci-pci version with the generic sdhci version." Also subject should begin "mmc: sdhci-pci: "... Otherwise: Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-pci-core.c | 30 +++--------------------------- > 1 file changed, 3 insertions(+), 27 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index 92fc3f7c538d..dfe217e7fbfe 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -35,7 +35,6 @@ > #include "sdhci-pci-o2micro.h" > > static int sdhci_pci_enable_dma(struct sdhci_host *host); > -static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width); > static void sdhci_pci_hw_reset(struct sdhci_host *host); > > #ifdef CONFIG_PM_SLEEP > @@ -547,7 +546,7 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { > .set_clock = sdhci_set_clock, > .set_power = sdhci_intel_set_power, > .enable_dma = sdhci_pci_enable_dma, > - .set_bus_width = sdhci_pci_set_bus_width, > + .set_bus_width = sdhci_set_bus_width, > .reset = sdhci_reset, > .set_uhs_signaling = sdhci_set_uhs_signaling, > .hw_reset = sdhci_pci_hw_reset, > @@ -1159,7 +1158,7 @@ static int amd_probe(struct sdhci_pci_chip *chip) > static const struct sdhci_ops amd_sdhci_pci_ops = { > .set_clock = sdhci_set_clock, > .enable_dma = sdhci_pci_enable_dma, > - .set_bus_width = sdhci_pci_set_bus_width, > + .set_bus_width = sdhci_set_bus_width, > .reset = sdhci_reset, > .set_uhs_signaling = sdhci_set_uhs_signaling, > .platform_execute_tuning = amd_execute_tuning, > @@ -1750,29 +1749,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host) > return 0; > } > > -static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width) > -{ > - u8 ctrl; > - > - ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); > - > - switch (width) { > - case MMC_BUS_WIDTH_8: > - ctrl |= SDHCI_CTRL_8BITBUS; > - ctrl &= ~SDHCI_CTRL_4BITBUS; > - break; > - case MMC_BUS_WIDTH_4: > - ctrl |= SDHCI_CTRL_4BITBUS; > - ctrl &= ~SDHCI_CTRL_8BITBUS; > - break; > - default: > - ctrl &= ~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_4BITBUS); > - break; > - } > - > - sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); > -} > - > static void sdhci_pci_gpio_hw_reset(struct sdhci_host *host) > { > struct sdhci_pci_slot *slot = sdhci_priv(host); > @@ -1799,7 +1775,7 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host) > static const struct sdhci_ops sdhci_pci_ops = { > .set_clock = sdhci_set_clock, > .enable_dma = sdhci_pci_enable_dma, > - .set_bus_width = sdhci_pci_set_bus_width, > + .set_bus_width = sdhci_set_bus_width, > .reset = sdhci_reset, > .set_uhs_signaling = sdhci_set_uhs_signaling, > .hw_reset = sdhci_pci_hw_reset, > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 92fc3f7c538d..dfe217e7fbfe 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -35,7 +35,6 @@ #include "sdhci-pci-o2micro.h" static int sdhci_pci_enable_dma(struct sdhci_host *host); -static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width); static void sdhci_pci_hw_reset(struct sdhci_host *host); #ifdef CONFIG_PM_SLEEP @@ -547,7 +546,7 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { .set_clock = sdhci_set_clock, .set_power = sdhci_intel_set_power, .enable_dma = sdhci_pci_enable_dma, - .set_bus_width = sdhci_pci_set_bus_width, + .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, @@ -1159,7 +1158,7 @@ static int amd_probe(struct sdhci_pci_chip *chip) static const struct sdhci_ops amd_sdhci_pci_ops = { .set_clock = sdhci_set_clock, .enable_dma = sdhci_pci_enable_dma, - .set_bus_width = sdhci_pci_set_bus_width, + .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .platform_execute_tuning = amd_execute_tuning, @@ -1750,29 +1749,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host) return 0; } -static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width) -{ - u8 ctrl; - - ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); - - switch (width) { - case MMC_BUS_WIDTH_8: - ctrl |= SDHCI_CTRL_8BITBUS; - ctrl &= ~SDHCI_CTRL_4BITBUS; - break; - case MMC_BUS_WIDTH_4: - ctrl |= SDHCI_CTRL_4BITBUS; - ctrl &= ~SDHCI_CTRL_8BITBUS; - break; - default: - ctrl &= ~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_4BITBUS); - break; - } - - sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); -} - static void sdhci_pci_gpio_hw_reset(struct sdhci_host *host) { struct sdhci_pci_slot *slot = sdhci_priv(host); @@ -1799,7 +1775,7 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host) static const struct sdhci_ops sdhci_pci_ops = { .set_clock = sdhci_set_clock, .enable_dma = sdhci_pci_enable_dma, - .set_bus_width = sdhci_pci_set_bus_width, + .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset,
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- drivers/mmc/host/sdhci-pci-core.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)