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/octeontx/nicvf_main.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/octeontx/nicvf_main.c')
| -rw-r--r-- | drivers/net/octeontx/nicvf_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c index e13c8b9556..750629a86c 100644 --- a/drivers/net/octeontx/nicvf_main.c +++ b/drivers/net/octeontx/nicvf_main.c @@ -105,7 +105,7 @@ static int nicvf_check_pf_ready(struct nicvf *nic) static void nicvf_handle_mbx_intr(struct nicvf *nic) { union nic_mbx mbx = {}; - struct eth_pdata *pdata = dev_get_platdata(nic->dev); + struct eth_pdata *pdata = dev_get_plat(nic->dev); u64 *mbx_data; u64 mbx_addr; int i; @@ -165,7 +165,7 @@ static void nicvf_handle_mbx_intr(struct nicvf *nic) static int nicvf_hw_set_mac_addr(struct nicvf *nic, struct udevice *dev) { union nic_mbx mbx = {}; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); mbx.mac.msg = NIC_MBOX_MSG_SET_MAC; mbx.mac.vf_id = nic->vf_id; @@ -445,7 +445,7 @@ int nicvf_open(struct udevice *dev) int nicvf_write_hwaddr(struct udevice *dev) { unsigned char ethaddr[ARP_HLEN]; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct nicvf *nic = dev_get_priv(dev); /* If lower level firmware fails to set proper MAC @@ -484,7 +484,7 @@ static void nicvf_probe_mdio_devices(void) int nicvf_initialize(struct udevice *dev) { struct nicvf *nicvf = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret = 0, bgx, lmac; char name[16]; unsigned char ethaddr[ARP_HLEN]; @@ -568,8 +568,8 @@ U_BOOT_DRIVER(octeontx_vnic) = { .id = UCLASS_ETH, .probe = octeontx_vnic_probe, .ops = &octeontx_vnic_ops, - .priv_auto_alloc_size = sizeof(struct nicvf), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct nicvf), + .plat_auto = sizeof(struct eth_pdata), }; static struct pci_device_id octeontx_vnic_supported[] = { |