In fact, the original name is unsuitable for its behavior. It's better to rename to set_clock_ext.
Signed-off-by: Ziyuan Xu xzy.xu@rock-chips.com ---
drivers/mmc/s5p_sdhci.c | 4 ++-- drivers/mmc/sdhci.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 640ea02..b8d3ded 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -73,14 +73,14 @@ static void s5p_sdhci_set_control_reg(struct sdhci_host *host) sdhci_writel(host, ctrl, SDHCI_CONTROL2); }
-static void s5p_set_clock(struct sdhci_host *host, u32 div) +static void s5p_set_clock_ext(struct sdhci_host *host, u32 div) { /* ToDo : Use the Clock Framework */ set_mmc_clk(host->index, div); }
static const struct sdhci_ops s5p_sdhci_ops = { - .set_clock = &s5p_set_clock, + .set_clock_ext = &s5p_set_clock_ext, .set_control_reg = &s5p_sdhci_set_control_reg, };
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 8f4a2a1..5c6dbdc 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -366,8 +366,8 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) div >>= 1; }
- if (host->ops && host->ops->set_clock) - host->ops->set_clock(host, div); + if (host->ops && host->ops->set_clock_ext) + host->ops->set_clock_ext(host, div);
clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN)