diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
| commit | 8351a29d2df18c92d8e365cfa848218c3859f3d2 (patch) | |
| tree | 5d29001be9accfb8029df9d9ed78fba196ee07b9 /drivers/net/smc911x.c | |
| parent | ddaa94978583d07ec515e7226e397221d8cc44c8 (diff) | |
| parent | b7bbd553de0d9752f919dfc616f560f6f2504c14 (diff) | |
Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next
Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 09372d7f6b..7b79831c28 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -536,7 +536,7 @@ err_detect: static int smc911x_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct smc911x_priv *priv = dev_get_priv(dev); memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -577,7 +577,7 @@ static int smc911x_recv(struct udevice *dev, int flags, uchar **packetp) static int smc911x_read_rom_hwaddr(struct udevice *dev) { struct smc911x_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); if (!smc911x_read_mac_address(priv)) return -ENODEV; @@ -607,10 +607,10 @@ static int smc911x_probe(struct udevice *dev) return 0; } -static int smc911x_ofdata_to_platdata(struct udevice *dev) +static int smc911x_of_to_plat(struct udevice *dev) { struct smc911x_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); pdata->iobase = dev_read_addr(dev); priv->iobase = pdata->iobase; @@ -636,11 +636,11 @@ U_BOOT_DRIVER(smc911x) = { .id = UCLASS_ETH, .of_match = smc911x_ids, .bind = smc911x_bind, - .ofdata_to_platdata = smc911x_ofdata_to_platdata, + .of_to_plat = smc911x_of_to_plat, .probe = smc911x_probe, .ops = &smc911x_ops, - .priv_auto_alloc_size = sizeof(struct smc911x_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct smc911x_priv), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif |