On Sun, Apr 26, 2026 at 08:44:27PM -0700, Rosen Penev wrote: > mt76_get_of_data_from_mtd has been replaced by > mt76_get_of_data_from_nvmem in all usages. All users in the kernel, but what about other sources of devicetrees? Those built into firmware etc? Are there none of those too? Conor. > > Remove it to prevent people from using the deprecated > mediatek,mtd-eeprom binding. > > Signed-off-by: Rosen Penev > --- > drivers/net/wireless/mediatek/mt76/eeprom.c | 87 ------------------- > drivers/net/wireless/mediatek/mt76/mt76.h | 1 - > .../wireless/mediatek/mt76/mt7915/eeprom.c | 4 - > 3 files changed, 92 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c > index afdb73661866..092804323d81 100644 > --- a/drivers/net/wireless/mediatek/mt76/eeprom.c > +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c > @@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len) > return 0; > } > > -int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len) > -{ > -#ifdef CONFIG_MTD > - struct device_node *np = dev->dev->of_node; > - struct mtd_info *mtd; > - const __be32 *list; > - const char *part; > - phandle phandle; > - size_t retlen; > - int size; > - int ret; > - > - list = of_get_property(np, "mediatek,mtd-eeprom", &size); > - if (!list) > - return -ENOENT; > - > - phandle = be32_to_cpup(list++); > - if (!phandle) > - return -ENOENT; > - > - np = of_find_node_by_phandle(phandle); > - if (!np) > - return -EINVAL; > - > - part = of_get_property(np, "label", NULL); > - if (!part) > - part = np->name; > - > - mtd = get_mtd_device_nm(part); > - if (IS_ERR(mtd)) { > - ret = PTR_ERR(mtd); > - goto out_put_node; > - } > - > - if (size <= sizeof(*list)) { > - ret = -EINVAL; > - goto out_put_node; > - } > - > - offset += be32_to_cpup(list); > - ret = mtd_read(mtd, offset, len, &retlen, eep); > - put_mtd_device(mtd); > - if (mtd_is_bitflip(ret)) > - ret = 0; > - if (ret) { > - dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n", > - part, ret); > - goto out_put_node; > - } > - > - if (retlen < len) { > - ret = -EINVAL; > - goto out_put_node; > - } > - > - if (of_property_read_bool(dev->dev->of_node, "big-endian")) { > - u8 *data = (u8 *)eep; > - int i; > - > - /* convert eeprom data in Little Endian */ > - for (i = 0; i < round_down(len, 2); i += 2) > - put_unaligned_le16(get_unaligned_be16(&data[i]), > - &data[i]); > - } > - > -#ifdef CONFIG_NL80211_TESTMODE > - dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL); > - if (!dev->test_mtd.name) { > - ret = -ENOMEM; > - goto out_put_node; > - } > - dev->test_mtd.offset = offset; > -#endif > - > -out_put_node: > - of_node_put(np); > - return ret; > -#else > - return -ENOENT; > -#endif > -} > -EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd); > - > int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep, > const char *cell_name, int len) > { > @@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len) > if (!ret) > return 0; > > - ret = mt76_get_of_data_from_mtd(dev, eep, 0, len); > - if (!ret) > - return 0; > - > return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len); > } > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h > index 527bef97e122..f447ecac664d 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76.h > @@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, > > int mt76_eeprom_init(struct mt76_dev *dev, int len); > int mt76_eeprom_override(struct mt76_phy *phy); > -int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len); > int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep, > const char *cell_name, int len); > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c > index eb92cbf1a284..c24e1276700b 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c > @@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev) > > offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2; > > - ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size); > - if (!ret) > - return ret; > - > ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size); > if (!ret) > return ret; > -- > 2.54.0 >