diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/net/mscc_eswitch/serval_switch.c | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net/mscc_eswitch/serval_switch.c')
| -rw-r--r-- | drivers/net/mscc_eswitch/serval_switch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index d8ee1a76989..09ce33452dd 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -373,7 +373,7 @@ static int serval_initialize(struct serval_private *priv) static int serval_write_hwaddr(struct udevice *dev) { struct serval_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); mscc_mac_table_add(priv->regs[ANA], serval_regs_ana_table, pdata->enetaddr, PGID_UNICAST); @@ -386,7 +386,7 @@ static int serval_write_hwaddr(struct udevice *dev) static int serval_start(struct udevice *dev) { struct serval_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; @@ -604,6 +604,6 @@ U_BOOT_DRIVER(serval) = { .probe = serval_probe, .remove = serval_remove, .ops = &serval_ops, - .priv_auto_alloc_size = sizeof(struct serval_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct serval_private), + .plat_auto = sizeof(struct eth_pdata), }; |