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/sandbox.c | |
parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net/sandbox.c')
-rw-r--r-- | drivers/net/sandbox.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 4f7e3d42438..a389e2bd0d1 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -393,7 +393,7 @@ static void sb_eth_stop(struct udevice *dev) static int sb_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); debug("eth_sandbox %s: Write HW ADDR - %pM\n", dev->name, pdata->enetaddr); @@ -414,9 +414,9 @@ static int sb_eth_remove(struct udevice *dev) return 0; } -static int sb_eth_ofdata_to_platdata(struct udevice *dev) +static int sb_eth_of_to_plat(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_priv *priv = dev_get_priv(dev); const u8 *mac; @@ -443,9 +443,9 @@ U_BOOT_DRIVER(eth_sandbox) = { .name = "eth_sandbox", .id = UCLASS_ETH, .of_match = sb_eth_ids, - .ofdata_to_platdata = sb_eth_ofdata_to_platdata, + .of_to_plat = sb_eth_of_to_plat, .remove = sb_eth_remove, .ops = &sb_eth_ops, - .priv_auto_alloc_size = sizeof(struct eth_sandbox_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct eth_sandbox_priv), + .plat_auto = sizeof(struct eth_pdata), }; |