diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-25 12:58:45 +0100 |
|---|---|---|
| committer |   Chris Ball <chris@printf.net> | 2014-05-22 07:26:31 -0400 |
| commit | 373073efd06528867df963724a93f29c7d5534d0 (patch) | |
| tree | 243ef5e56d8d686f824151bd4e8514a43b4d63e7 /drivers/mmc/host/sdhci-cns3xxx.c | |
| parent | mmc: sdhci: clean up sdhci_update_clock()/sdhci_set_clock() (diff) | |
| download | linux-dev-373073efd06528867df963724a93f29c7d5534d0.tar.xz linux-dev-373073efd06528867df963724a93f29c7d5534d0.zip | |
mmc: sdhci: move setting host->clock into sdhci_do_set_ios()
We don't need implementations to do this, since the only time it's
necessary is when we change the clock, and the only place that happens
is in sdhci_do_set_ios(). So, move it there, and remove it from the
iMX platform backend.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host/sdhci-cns3xxx.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-cns3xxx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index fa11f63b78a0..f11fb908ad78 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -33,7 +33,7 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock) sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); if (clock == 0) - goto out; + return; while (host->max_clk / div > clock) { /* @@ -72,8 +72,6 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock) clk |= SDHCI_CLOCK_CARD_EN; sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); -out: - host->clock = clock; } static const struct sdhci_ops sdhci_cns3xxx_ops = { |