xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stmmac: remove setup/free glue callbacks

Browse Source 
As all dwmac-* drivers have been converted to have a proper probe
function the setup callback can now be removed. Also remove the
free callback that wasn't used by any driver.

New dwmac-* drivers should implement standard probe and remove
functions to preform any needed setup and teardown.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joachim Eastwood
2015-07-29 00:09:03 +02:00
committed by David S. Miller
parent 0933328a1b
commit 75fee59550
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/networking/stmmac.txt
View File

@@ -135,8 +135,6 @@ struct plat_stmmacenet_data {
int maxmtu; int maxmtu;
void (*fix_mac_speed)(void *priv, unsigned int speed); void (*fix_mac_speed)(void *priv, unsigned int speed);
void (*bus_setup)(void __iomem *ioaddr); void (*bus_setup)(void __iomem *ioaddr);
void *(*setup)(struct platform_device *pdev);
void (*free)(struct platform_device *pdev, void *priv);
int (*init)(struct platform_device *pdev, void *priv); int (*init)(struct platform_device *pdev, void *priv);
void (*exit)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv);
void *bsp_priv; void *bsp_priv;
@@ -177,12 +175,10 @@ Where:
o bus_setup: perform HW setup of the bus. For example, on some ST platforms o bus_setup: perform HW setup of the bus. For example, on some ST platforms
this field is used to configure the AMBA bridge to generate more this field is used to configure the AMBA bridge to generate more
efficient STBus traffic. efficient STBus traffic.
o setup/init/exit: callbacks used for calling a custom initialization; o init/exit: callbacks used for calling a custom initialization;
this is sometime necessary on some platforms (e.g. ST boxes) this is sometime necessary on some platforms (e.g. ST boxes)
where the HW needs to have set some PIO lines or system cfg where the HW needs to have set some PIO lines or system cfg
registers. setup should return a pointer to private data, registers. init/exit callbacks should not use or modify
which will be stored in bsp_priv, and then passed to init and
exit callbacks. init/exit callbacks should not use or modify
platform data. platform data.
o bsp_priv: another private pointer. o bsp_priv: another private pointer.

7
drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
View File

@@ -46,13 +46,6 @@ static int dwmac_generic_probe(struct platform_device *pdev)
plat_dat->unicast_filter_entries = 1; plat_dat->unicast_filter_entries = 1;
} }
/* Custom setup (if needed) */
if (plat_dat->setup) {
plat_dat->bsp_priv = plat_dat->setup(pdev);
if (IS_ERR(plat_dat->bsp_priv))
return PTR_ERR(plat_dat->bsp_priv);
}
/* Custom initialisation (if needed) */ /* Custom initialisation (if needed) */
if (plat_dat->init) { if (plat_dat->init) {
ret = plat_dat->init(pdev, plat_dat->bsp_priv); ret = plat_dat->init(pdev, plat_dat->bsp_priv);

3
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@@ -300,9 +300,6 @@ int stmmac_pltfr_remove(struct platform_device *pdev)
if (priv->plat->exit) if (priv->plat->exit)
priv->plat->exit(pdev, priv->plat->bsp_priv); priv->plat->exit(pdev, priv->plat->bsp_priv);
if (priv->plat->free)
priv->plat->free(pdev, priv->plat->bsp_priv);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(stmmac_pltfr_remove); EXPORT_SYMBOL_GPL(stmmac_pltfr_remove);

2
include/linux/stmmac.h
View File

@@ -119,8 +119,6 @@ struct plat_stmmacenet_data {
int rx_fifo_size; int rx_fifo_size;
void (*fix_mac_speed)(void *priv, unsigned int speed); void (*fix_mac_speed)(void *priv, unsigned int speed);
void (*bus_setup)(void __iomem *ioaddr); void (*bus_setup)(void __iomem *ioaddr);
void *(*setup)(struct platform_device *pdev);
void (*free)(struct platform_device *pdev, void *priv);
int (*init)(struct platform_device *pdev, void *priv); int (*init)(struct platform_device *pdev, void *priv);
void (*exit)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv);
void *bsp_priv; void *bsp_priv;