diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-06-12 14:57:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-06-13 09:51:46 +0200 |
| commit | 131717f2dc7038a1feea37d532d9111790c03a15 (patch) | |
| tree | 4415130b2b9de14cf753fe14d19fc8803a917884 /drivers/net | |
| parent | 23b059783d4abcdcd00b6e3aa2d5ce4bad8493de (diff) | |
| download | barebox-131717f2dc7038a1feea37d532d9111790c03a15.tar.gz barebox-131717f2dc7038a1feea37d532d9111790c03a15.tar.xz | |
nvmem: retire struct nvmem_bus for better Linux compatibility
nvmem_bus is arguably a confusing name and serves no real purpose over
just embedding its two members directly. That's what Linux currently
does, so follow suit.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20230612125711.1086786-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/mv88e6xxx/chip.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/phy/mv88e6xxx/chip.c b/drivers/net/phy/mv88e6xxx/chip.c index 4dbc4cc341..5c1e0a5242 100644 --- a/drivers/net/phy/mv88e6xxx/chip.c +++ b/drivers/net/phy/mv88e6xxx/chip.c @@ -832,11 +832,6 @@ static int mv88e6xxx_eeprom_write(void *ctx, unsigned offset, const void *val, s return chip->info->ops->set_eeprom(chip, &eeprom, (void *)val); } -static const struct nvmem_bus mv88e6xxx_eeprom_nvmem_bus = { - .write = mv88e6xxx_eeprom_write, - .read = mv88e6xxx_eeprom_read, -}; - static int mv88e6xxx_probe(struct device *dev) { struct device_node *np = dev->of_node; @@ -911,7 +906,8 @@ static int mv88e6xxx_probe(struct device *dev) .stride = 1, .size = eeprom_len, .read_only = false, - .bus = &mv88e6xxx_eeprom_nvmem_bus, + .reg_write = mv88e6xxx_eeprom_write, + .reg_read = mv88e6xxx_eeprom_read, }; if (IS_ERR(nvmem_register(&config))) |