Skip to content
Snippets Groups Projects
Commit ee622f03 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Joe Hershberger
Browse files

net: phy: dp83867: move static initialization to .probe()


Move static, one-time initialization to .probe() callback.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Acked-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
parent 5ee989c5
No related branches found
No related tags found
No related merge requests found
...@@ -204,18 +204,11 @@ static int dp83867_config(struct phy_device *phydev) ...@@ -204,18 +204,11 @@ static int dp83867_config(struct phy_device *phydev)
unsigned int val, delay, cfg2; unsigned int val, delay, cfg2;
int ret, bs; int ret, bs;
if (!phydev->priv) { dp83867 = (struct dp83867_private *)phydev->priv;
dp83867 = kzalloc(sizeof(*dp83867), GFP_KERNEL);
if (!dp83867)
return -ENOMEM;
phydev->priv = dp83867; ret = dp83867_of_init(phydev);
ret = dp83867_of_init(phydev); if (ret)
if (ret) return ret;
goto err_out;
} else {
dp83867 = (struct dp83867_private *)phydev->priv;
}
/* Restart the PHY. */ /* Restart the PHY. */
val = phy_read(phydev, MDIO_DEVAD_NONE, DP83867_CTRL); val = phy_read(phydev, MDIO_DEVAD_NONE, DP83867_CTRL);
...@@ -324,15 +317,27 @@ static int dp83867_config(struct phy_device *phydev) ...@@ -324,15 +317,27 @@ static int dp83867_config(struct phy_device *phydev)
return 0; return 0;
err_out: err_out:
kfree(dp83867);
return ret; return ret;
} }
static int dp83867_probe(struct phy_device *phydev)
{
struct dp83867_private *dp83867;
dp83867 = kzalloc(sizeof(*dp83867), GFP_KERNEL);
if (!dp83867)
return -ENOMEM;
phydev->priv = dp83867;
return 0;
}
static struct phy_driver DP83867_driver = { static struct phy_driver DP83867_driver = {
.name = "TI DP83867", .name = "TI DP83867",
.uid = 0x2000a231, .uid = 0x2000a231,
.mask = 0xfffffff0, .mask = 0xfffffff0,
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.probe = dp83867_probe,
.config = &dp83867_config, .config = &dp83867_config,
.startup = &genphy_startup, .startup = &genphy_startup,
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment