stmmac: export probe_config_dt() and get_platform_resources()

manabian · davem330 · commit 402dae0bed98 · 2015-07-20T20:45:57.000-07:00
Export stmmac_probe_config_dt() and stmmac_get_platform_resources()
so they can be used in the dwmac-* drivers themselves. This will
allow us to build more flexible and standalone drivers which just
use stmmac_platform as a library for setup functions.

Signed-off-by: Joachim Eastwood &lt;manabian@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -104,7 +104,7 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)
  * this function is to read the driver parameters from device-tree and
  * set some private fields that will be used by the main at runtime.
  */
-static struct plat_stmmacenet_data *
+struct plat_stmmacenet_data *
 stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -251,15 +251,16 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
 	return plat;
 }
 #else
-static struct plat_stmmacenet_data *
+struct plat_stmmacenet_data *
 stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
 {
 	return ERR_PTR(-ENOSYS);
 }
 #endif /* CONFIG_OF */
+EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);
 
-static int stmmac_get_platform_resources(struct platform_device *pdev,
-					 struct stmmac_resources *stmmac_res)
+int stmmac_get_platform_resources(struct platform_device *pdev,
+				  struct stmmac_resources *stmmac_res)
 {
 	struct resource *res;
 
@@ -302,6 +303,7 @@ static int stmmac_get_platform_resources(struct platform_device *pdev,
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(stmmac_get_platform_resources);
 
 /**
  * stmmac_pltfr_probe - platform driver probe.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
@@ -19,6 +19,14 @@
 #ifndef __STMMAC_PLATFORM_H__
 #define __STMMAC_PLATFORM_H__
 
+#include "stmmac.h"
+
+struct plat_stmmacenet_data *
+stmmac_probe_config_dt(struct platform_device *pdev, const char **mac);
+
+int stmmac_get_platform_resources(struct platform_device *pdev,
+				  struct stmmac_resources *stmmac_res);
+
 int stmmac_pltfr_probe(struct platform_device *pdev);
 int stmmac_pltfr_remove(struct platform_device *pdev);
 extern const struct dev_pm_ops stmmac_pltfr_pm_ops;

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)`
`104`	`104`	`* this function is to read the driver parameters from device-tree and`
`105`	`105`	`* set some private fields that will be used by the main at runtime.`
`106`	`106`	`*/`
`107`		`-static struct plat_stmmacenet_data *`
	`107`	`+struct plat_stmmacenet_data *`
`108`	`108`	`stmmac_probe_config_dt(struct platform_device pdev, const char *mac)`
`109`	`109`	`{`
`110`	`110`	`struct device_node *np = pdev->dev.of_node;`
`@@ -251,15 +251,16 @@ stmmac_probe_config_dt(struct platform_device pdev, const char *mac)`
`251`	`251`	`return plat;`
`252`	`252`	`}`
`253`	`253`	`#else`
`254`		`-static struct plat_stmmacenet_data *`
	`254`	`+struct plat_stmmacenet_data *`
`255`	`255`	`stmmac_probe_config_dt(struct platform_device pdev, const char *mac)`
`256`	`256`	`{`
`257`	`257`	`return ERR_PTR(-ENOSYS);`
`258`	`258`	`}`
`259`	`259`	`#endif /* CONFIG_OF */`
	`260`	`+EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);`
`260`	`261`
`261`		`-static int stmmac_get_platform_resources(struct platform_device *pdev,`
`262`		`- struct stmmac_resources *stmmac_res)`
	`262`	`+int stmmac_get_platform_resources(struct platform_device *pdev,`
	`263`	`+ struct stmmac_resources *stmmac_res)`
`263`	`264`	`{`
`264`	`265`	`struct resource *res;`
`265`	`266`
`@@ -302,6 +303,7 @@ static int stmmac_get_platform_resources(struct platform_device *pdev,`
`302`	`303`
`303`	`304`	`return 0;`
`304`	`305`	`}`
	`306`	`+EXPORT_SYMBOL_GPL(stmmac_get_platform_resources);`
`305`	`307`
`306`	`308`	`/**`
`307`	`309`	`* stmmac_pltfr_probe - platform driver probe.`