diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-06-22 09:59:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-06-22 09:59:24 +0200 |
| commit | 2c4523beb1aaa54d5ff2af2ad89b0c900d31cf39 (patch) | |
| tree | 26a5845e79fe9e807ae63e7bb1cf8d8563588d54 /drivers/net/phy/mv88e6xxx/chip.c | |
| parent | 47f6d253d678f97108b50d0c99a599f082de6a87 (diff) | |
| parent | b1185e4a6a935b14dfe24654a4cb058dce5b93aa (diff) | |
| download | barebox-2c4523beb1aaa54d5ff2af2ad89b0c900d31cf39.tar.gz barebox-2c4523beb1aaa54d5ff2af2ad89b0c900d31cf39.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/net/phy/mv88e6xxx/chip.c')
| -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 0c37ba9594..b9b02c52f2 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))) |