UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

stmmac: dwmac-sti: turn setup callback into a probe function 

By using a few functions from stmmac_platform a proper probe
function can be created from the setup glue callback. This
makes it look more like a standard driver and prepares the
driver for further clean ups.

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:08:55 +02:00 committed by David S. Miller
parent 9a9e9a1ede
commit 8387ee21f9
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
View File

@ -334,36 +334,49 @@ static int sti_dwmac_parse_data(struct sti_dwmac *dwmac,
return 0; return 0;
} }
static void *sti_dwmac_setup(struct platform_device *pdev) static int sti_dwmac_probe(struct platform_device *pdev)
{ {
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
struct sti_dwmac *dwmac; struct sti_dwmac *dwmac;
int ret; int ret;
ret = stmmac_get_platform_resources(pdev, &stmmac_res);
if (ret)
return ret;
plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
if (IS_ERR(plat_dat))
return PTR_ERR(plat_dat);
dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL); dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
if (!dwmac) if (!dwmac)
return ERR_PTR(-ENOMEM); return -ENOMEM;
ret = sti_dwmac_parse_data(dwmac, pdev); ret = sti_dwmac_parse_data(dwmac, pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Unable to parse OF data\n"); dev_err(&pdev->dev, "Unable to parse OF data\n");
return ERR_PTR(ret); return ret;
} }
return dwmac; plat_dat->bsp_priv = dwmac;
plat_dat->exit = sti_dwmac_exit;
ret = plat_dat->init(pdev, plat_dat->bsp_priv);
if (ret)
return ret;
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
} }
static const struct stmmac_of_data stih4xx_dwmac_data = { static const struct stmmac_of_data stih4xx_dwmac_data = {
.fix_mac_speed = stih4xx_fix_retime_src, .fix_mac_speed = stih4xx_fix_retime_src,
.setup = sti_dwmac_setup,
.init = stix4xx_init, .init = stix4xx_init,
.exit = sti_dwmac_exit,
}; };
static const struct stmmac_of_data stid127_dwmac_data = { static const struct stmmac_of_data stid127_dwmac_data = {
.fix_mac_speed = stid127_fix_retime_src, .fix_mac_speed = stid127_fix_retime_src,
.setup = sti_dwmac_setup,
.init = stid127_init, .init = stid127_init,
.exit = sti_dwmac_exit,
}; };
static const struct of_device_id sti_dwmac_match[] = { static const struct of_device_id sti_dwmac_match[] = {
@ -376,7 +389,7 @@ static const struct of_device_id sti_dwmac_match[] = {
MODULE_DEVICE_TABLE(of, sti_dwmac_match); MODULE_DEVICE_TABLE(of, sti_dwmac_match);
static struct platform_driver sti_dwmac_driver = { static struct platform_driver sti_dwmac_driver = {
.probe = stmmac_pltfr_probe, .probe = sti_dwmac_probe,
.remove = stmmac_pltfr_remove, .remove = stmmac_pltfr_remove,
.driver = { .driver = {
.name = "sti-dwmac", .name = "sti-dwmac",