mmc: sdhci-pltfm: Rename sdhci_pltfm_register()

ahunter6 · storulf · commit 899171dc4e7c · 2023-08-15T13:36:02.000+02:00
Now that sdhci_pltfm_unregister() has been removed, rename sdhci_pltfm_register() to sdhci_pltfm_init_and_add_host() to better reflect what it does. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230811130351.7038-17-adrian.hunter@intel.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
@@ -68,7 +68,7 @@ static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {
 
 static int sdhci_hlwd_probe(struct platform_device *pdev)
 {
-	return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata, 0);
+	return sdhci_pltfm_init_and_add_host(pdev, &sdhci_hlwd_pdata, 0);
 }
 
 static const struct of_device_id sdhci_hlwd_of_match[] = {
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
@@ -166,9 +166,9 @@ void sdhci_pltfm_free(struct platform_device *pdev)
 }
 EXPORT_SYMBOL_GPL(sdhci_pltfm_free);
 
-int sdhci_pltfm_register(struct platform_device *pdev,
-			const struct sdhci_pltfm_data *pdata,
-			size_t priv_size)
+int sdhci_pltfm_init_and_add_host(struct platform_device *pdev,
+				  const struct sdhci_pltfm_data *pdata,
+				  size_t priv_size)
 {
 	struct sdhci_host *host;
 	int ret = 0;
@@ -185,7 +185,7 @@ int sdhci_pltfm_register(struct platform_device *pdev,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(sdhci_pltfm_register);
+EXPORT_SYMBOL_GPL(sdhci_pltfm_init_and_add_host);
 
 void sdhci_pltfm_remove(struct platform_device *pdev)
 {
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
@@ -99,9 +99,9 @@ extern struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
 					  size_t priv_size);
 extern void sdhci_pltfm_free(struct platform_device *pdev);
 
-extern int sdhci_pltfm_register(struct platform_device *pdev,
-				const struct sdhci_pltfm_data *pdata,
-				size_t priv_size);
+extern int sdhci_pltfm_init_and_add_host(struct platform_device *pdev,
+					 const struct sdhci_pltfm_data *pdata,
+					 size_t priv_size);
 extern void sdhci_pltfm_remove(struct platform_device *pdev);
 
 extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static const struct sdhci_pltfm_data sdhci_hlwd_pdata = {`
`68`	`68`
`69`	`69`	`static int sdhci_hlwd_probe(struct platform_device *pdev)`
`70`	`70`	`{`
`71`		`- return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata, 0);`
	`71`	`+ return sdhci_pltfm_init_and_add_host(pdev, &sdhci_hlwd_pdata, 0);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`static const struct of_device_id sdhci_hlwd_of_match[] = {`
Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,9 @@ void sdhci_pltfm_free(struct platform_device *pdev)`
`166`	`166`	`}`
`167`	`167`	`EXPORT_SYMBOL_GPL(sdhci_pltfm_free);`
`168`	`168`
`169`		`-int sdhci_pltfm_register(struct platform_device *pdev,`
`170`		`- const struct sdhci_pltfm_data *pdata,`
`171`		`- size_t priv_size)`
	`169`	`+int sdhci_pltfm_init_and_add_host(struct platform_device *pdev,`
	`170`	`+ const struct sdhci_pltfm_data *pdata,`
	`171`	`+ size_t priv_size)`
`172`	`172`	`{`
`173`	`173`	`struct sdhci_host *host;`
`174`	`174`	`int ret = 0;`
`@@ -185,7 +185,7 @@ int sdhci_pltfm_register(struct platform_device *pdev,`
`185`	`185`
`186`	`186`	`return ret;`
`187`	`187`	`}`
`188`		`-EXPORT_SYMBOL_GPL(sdhci_pltfm_register);`
	`188`	`+EXPORT_SYMBOL_GPL(sdhci_pltfm_init_and_add_host);`
`189`	`189`
`190`	`190`	`void sdhci_pltfm_remove(struct platform_device *pdev)`
`191`	`191`	`{`