diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-11-25 23:31:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-03 14:26:15 +0100 |
| commit | c329fe53474ac424cd5eb77c2b6b1fb3fc136d7b (patch) | |
| tree | a476d20e98e1887b3d244af1ef68fdb150946ac6 /drivers/misc/eeprom/at25.c | |
| parent | 51902c1212feb9652826fd978e5c58b683f865db (diff) | |
| download | lwn-c329fe53474ac424cd5eb77c2b6b1fb3fc136d7b.tar.gz lwn-c329fe53474ac424cd5eb77c2b6b1fb3fc136d7b.zip | |
misc: at25: Unshadow error codes in at25_fw_to_chip()
device_property_read_u32() may return different error codes.
Unshadow them in the at25_fw_to_chip() to give better error
report.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211125213203.86693-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/eeprom/at25.c')
| -rw-r--r-- | drivers/misc/eeprom/at25.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index 6bea9c7c64a0..027840c73fc8 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -304,33 +304,35 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count) static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip) { u32 val; + int err; memset(chip, 0, sizeof(*chip)); strncpy(chip->name, "at25", sizeof(chip->name)); - if (device_property_read_u32(dev, "size", &val) == 0 || - device_property_read_u32(dev, "at25,byte-len", &val) == 0) { - chip->byte_len = val; - } else { + err = device_property_read_u32(dev, "size", &val); + if (err) + err = device_property_read_u32(dev, "at25,byte-len", &val); + if (err) { dev_err(dev, "Error: missing \"size\" property\n"); - return -ENODEV; + return err; } + chip->byte_len = val; - if (device_property_read_u32(dev, "pagesize", &val) == 0 || - device_property_read_u32(dev, "at25,page-size", &val) == 0) { - chip->page_size = val; - } else { + err = device_property_read_u32(dev, "pagesize", &val); + if (err) + err = device_property_read_u32(dev, "at25,page-size", &val); + if (err) { dev_err(dev, "Error: missing \"pagesize\" property\n"); - return -ENODEV; + return err; } - - if (device_property_read_u32(dev, "at25,addr-mode", &val) == 0) { - chip->flags = (u16)val; - } else { - if (device_property_read_u32(dev, "address-width", &val)) { - dev_err(dev, - "Error: missing \"address-width\" property\n"); - return -ENODEV; + chip->page_size = val; + + err = device_property_read_u32(dev, "at25,addr-mode", &val); + if (err) { + err = device_property_read_u32(dev, "address-width", &val); + if (err) { + dev_err(dev, "Error: missing \"address-width\" property\n"); + return err; } switch (val) { case 9: @@ -353,6 +355,8 @@ static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip) } if (device_property_present(dev, "read-only")) chip->flags |= EE_READONLY; + } else { + chip->flags = (u16)val; } return 0; } |