mmc: dw_mmc: change the callback function name.
Subsystems (2)
PATCH 1/1 mmc: dw_mmc: change the callback function name.
To prevent the confusion, use the get_mmc_clk() instead of mmc_clk(). get_mmc_clk() is more exactly name.
Signed-off-by Jaehoon Chung <[email protected]>
--- drivers/mmc/dw_mmc.c | 6 +++--- drivers/mmc/exynos_dw_mmc.c | 2 +- include/dwmmc.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/mmc/dw_mmc.c +3 -3
@@ -220,12 +220,12 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)if ((freq == host->clock) || (freq ==0 ))return 0 ;/* -* If host->mmc_clk didn't define, +* If host->get_mmc_clk didn't define, * then assume that host->bus_hz is source clock value. * host->bus_hz should be set from user. */ -if (host->mmc_clk) - sclk = host->mmc_clk (host->dev_index); +if (host->get_mmc_clk) + sclk = host->get_mmc_clk (host->dev_index);else if (host->bus_hz) sclk = host->bus_hz;else {
drivers/mmc/exynos_dw_mmc.c +1 -1
@@ -74,7 +74,7 @@ int exynos_dwmci_add_port(int index, u32 regbase, int bus_width, u32 clksel) host->clksel = exynos_dwmci_clksel; host->dev_index = index; - host->mmc_clk = exynos_dwmci_get_clk; + host->get_mmc_clk = exynos_dwmci_get_clk;/* Add the mmc channel to be registered with mmc core */ if (add_dwmci (host,DWMMC_MAX_FREQ ,DWMMC_MIN_FREQ )) {debug ("dwmmc%d registration failed\n" , index);
include/dwmmc.h +1 -1
@@ -138,7 +138,7 @@ struct dwmci_host {struct mmc *mmc;void (*clksel)(struct dwmci_host *host); -unsigned int (*mmc_clk)(int dev_index); +unsigned int (*get_mmc_clk)(int dev_index); };struct dwmci_idmac {
Signature · 1 line
1.7.9.5
Pantelis Antoniou
AppliedPATCH 1/1 mmc: dw_mmc: change the callback function name.
Hi Jaehoon,
Quoted 58 lines · Jaehoon Chung
To prevent the confusion, use the
get_mmc_clk()instead ofmmc_clk().get_mmc_clk()is more exactly name.Signed-off-by Jaehoon Chung <[email protected]>---
drivers/mmc/dw_mmc.c | 6 +++--- drivers/mmc/exynos_dw_mmc.c | 2 +- include/dwmmc.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/mmc/dw_mmc.c +3
-3@@ -220,12 +220,12 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)if ((freq == host->clock) || (freq ==0 ))return 0 ;/* -* If host->mmc_clk didn't define, +* If host->get_mmc_clk didn't define, * then assume that host->bus_hz is source clock value. * host->bus_hz should be set from user. */ -if (host->mmc_clk) - sclk = host->mmc_clk (host->dev_index); +if (host->get_mmc_clk) + sclk = host->get_mmc_clk (host->dev_index);else if (host->bus_hz) sclk = host->bus_hz;else {drivers/mmc/exynos_dw_mmc.c +1
-1@@ -74,7 +74,7 @@ int exynos_dwmci_add_port(int index, u32 regbase, int bus_width, u32 clksel) host->clksel = exynos_dwmci_clksel; host->dev_index = index; - host->mmc_clk = exynos_dwmci_get_clk; + host->get_mmc_clk = exynos_dwmci_get_clk;/* Add the mmc channel to be registered with mmc core */ if (add_dwmci (host,DWMMC_MAX_FREQ ,DWMMC_MIN_FREQ )) {debug ("dwmmc%d registration failed\n" , index);include/dwmmc.h +1
-1@@ -138,7 +138,7 @@ struct dwmci_host {struct mmc *mmc;void (*clksel)(struct dwmci_host *host); -unsigned int (*mmc_clk)(int dev_index); +unsigned int (*get_mmc_clk)(int dev_index); };struct dwmci_idmac {Signature · 1 line
1.7.9.5
Applied, thanks