Skip to content

Commit

Permalink
wifi: mt76: split get_of_eeprom in subfunction
Browse files Browse the repository at this point in the history
In preparation for NVMEM support, split get_of_eeprom() in subfunction
to tidy the code and facilitate the addition of alternative method to
get eeprom data. No behaviour change intended.

While at it also drop OF ifdef checks as OF have stubs and calling
of_get_property would result in the same error returned.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  • Loading branch information
Ansuel committed May 8, 2023
1 parent 021ded3 commit e7bceae
Showing 1 changed file with 41 additions and 18 deletions.
59 changes: 41 additions & 18 deletions eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,35 @@
#include <linux/etherdevice.h>
#include "mt76.h"

int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
{
#if defined(CONFIG_OF) && defined(CONFIG_MTD)
struct device_node *np = dev->dev->of_node;
struct mtd_info *mtd;
const __be32 *list;
const void *data;
const char *part;
phandle phandle;
int size;
size_t retlen;
int ret;

if (!np)
data = of_get_property(np, "mediatek,eeprom-data", &size);
if (!data)
return -ENOENT;

data = of_get_property(np, "mediatek,eeprom-data", &size);
if (data) {
if (size > len)
return -EINVAL;
if (size > len)
return -EINVAL;

memcpy(eep, data, size);
memcpy(eep, data, size);

return 0;
}
return 0;
}

#ifdef CONFIG_MTD
static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len)
{
struct device_node *np = dev->dev->of_node;
struct mtd_info *mtd;
const __be32 *list;
const char *part;
phandle phandle;
int size;
size_t retlen;
int ret;

list = of_get_property(np, "mediatek,mtd-eeprom", &size);
if (!list)
Expand Down Expand Up @@ -96,9 +100,28 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
out_put_node:
of_node_put(np);
return ret;
#else
return -ENOENT;
}
#endif

int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
{
struct device_node *np = dev->dev->of_node;
int ret;

if (!np)
return -ENOENT;

ret = mt76_get_of_eeprom_data(dev, eep, len);
if (!ret)
return 0;

#ifdef CONFIG_MTD
ret = mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
if (!ret)
return 0;
#endif

return ret;
}
EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);

Expand Down

0 comments on commit e7bceae

Please sign in to comment.