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/misc/p2sb_emul.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/misc/p2sb_emul.c')
| -rw-r--r-- | drivers/misc/p2sb_emul.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index a4b6dba516..973d02d678 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -18,12 +18,12 @@ #include <p2sb.h> /** - * struct p2sb_emul_platdata - platform data for this device + * struct p2sb_emul_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct p2sb_emul_platdata { +struct p2sb_emul_plat { u16 command; u32 bar[6]; }; @@ -53,7 +53,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -106,7 +106,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -134,7 +134,7 @@ static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, static int sandbox_p2sb_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); int barnum; for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -197,8 +197,8 @@ static int find_p2sb_channel(struct udevice *emul, uint offset, return log_msg_ret("No client", ret); device_foreach_child(dev, p2sb) { - struct p2sb_child_platdata *pplat = - dev_get_parent_platdata(dev); + struct p2sb_child_plat *pplat = + dev_get_parent_plat(dev); log_debug(" - child %s, pid %d, want %d\n", dev->name, pplat->pid, pid); @@ -262,8 +262,8 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = { .id = UCLASS_PCI_EMUL, .of_match = sandbox_p2sb_emul_ids, .ops = &sandbox_p2sb_emul_emul_ops, - .priv_auto_alloc_size = sizeof(struct p2sb_emul_priv), - .platdata_auto_alloc_size = sizeof(struct p2sb_emul_platdata), + .priv_auto = sizeof(struct p2sb_emul_priv), + .plat_auto = sizeof(struct p2sb_emul_plat), }; static struct pci_device_id sandbox_p2sb_emul_supported[] = { |