diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-05 22:34:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-05 22:34:43 -0500 |
| commit | b11f634b1c1be6ab419758c6596c673445e5ac70 (patch) | |
| tree | 2329e1ff53c6c543e01d84b7901c53621ad8b7f9 /drivers/gpio/gpio-uclass.c | |
| parent | 720620e6916ba40b9a173bb07706d2c73f3c23e7 (diff) | |
| parent | 970349a96dac3ad46c33851b1a773bfe3f1d4b33 (diff) | |
Merge tag 'dm-pull-5jan21' of git://git.denx.de/u-boot-dm into next
Driver model: make some udevice fields private
Driver model: Rename U_BOOT_DEVICE et al.
dtoc: Tidy up and add more tests
ns16550 code clean-up
x86 and sandbox minor fixes for of-platdata
dtoc prepration for adding build-time instantiation
Diffstat (limited to 'drivers/gpio/gpio-uclass.c')
| -rw-r--r-- | drivers/gpio/gpio-uclass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 65b18ce6c81..bad6b71e0c3 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -306,7 +306,7 @@ int gpio_hog_probe_all(void) for (uclass_first_device(UCLASS_NOP, &dev); dev; uclass_find_next_device(&dev)) { - if (dev->driver == DM_GET_DRIVER(gpio_hog)) { + if (dev->driver == DM_DRIVER_GET(gpio_hog)) { ret = device_probe(dev); if (ret) { printf("Failed to probe device %s err: %d\n", @@ -1165,7 +1165,7 @@ int gpio_get_number(const struct gpio_desc *desc) if (!dev) return -1; - uc_priv = dev->uclass_priv; + uc_priv = dev_get_uclass_priv(dev); return uc_priv->gpio_base + desc->offset; } |