diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-11-07 11:07:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-11-08 11:04:39 +0100 |
| commit | eb05a8e1d2b48b22aaa1f0444d0db5442abc9b4d (patch) | |
| tree | 8b28697563117d853023f32afc8820b2649b710f | |
| parent | 40d31b8e45421ed1fb6906a9fe2fca1d75f6b6ef (diff) | |
| download | barebox-eb05a8e1d2b48b22aaa1f0444d0db5442abc9b4d.tar.gz barebox-eb05a8e1d2b48b22aaa1f0444d0db5442abc9b4d.tar.xz | |
nvmem: remove IS_ERR_VALUE abuses
>From Kernel commit 287980e49ffc ("remove lots of IS_ERR_VALUE abuses"):
| Most users of IS_ERR_VALUE() in the kernel are wrong, as they
| pass an 'int' into a function that takes an 'unsigned long'
| argument. This happens to work because the type is sign-extended
| on 64-bit architectures before it gets converted into an
| unsigned type.
Based on the Kernel commit remove usage of IS_ERR_VALUE() from the
nvmem core.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.barebox.org/20221107100727.2510346-1-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/nvmem/core.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index c89ad08f81..8e07bdb501 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -526,7 +526,7 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem, int rc; rc = nvmem->bus->read(nvmem->priv, cell->offset, buf, cell->bytes); - if (IS_ERR_VALUE(rc)) + if (rc) return rc; /* shift bits in-place */ @@ -561,7 +561,7 @@ void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) return ERR_PTR(-ENOMEM); rc = __nvmem_cell_read(nvmem, cell, buf, len); - if (IS_ERR_VALUE(rc)) { + if (rc) { kfree(buf); return ERR_PTR(rc); } @@ -591,7 +591,7 @@ static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, /* setup the first byte with lsb bits from nvmem */ rc = nvmem->bus->read(nvmem->priv, cell->offset, &v, 1); - if (IS_ERR_VALUE(rc)) + if (rc) return ERR_PTR(rc); *b++ |= GENMASK(bit_offset - 1, 0) & v; @@ -612,7 +612,7 @@ static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, /* setup the last byte with msb bits from nvmem */ rc = nvmem->bus->read(nvmem->priv, cell->offset + cell->bytes - 1, &v, 1); - if (IS_ERR_VALUE(rc)) + if (rc) return ERR_PTR(rc); *p |= GENMASK(7, (nbits + bit_offset) % BITS_PER_BYTE) & v; @@ -652,7 +652,7 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len) if (cell->bit_offset || cell->nbits) kfree(buf); - if (IS_ERR_VALUE(rc)) + if (rc) return rc; return len; @@ -680,11 +680,11 @@ ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem, return -EINVAL; rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell); - if (IS_ERR_VALUE(rc)) + if (rc) return rc; rc = __nvmem_cell_read(nvmem, &cell, buf, &len); - if (IS_ERR_VALUE(rc)) + if (rc) return rc; return len; @@ -710,7 +710,7 @@ int nvmem_device_cell_write(struct nvmem_device *nvmem, return -EINVAL; rc = nvmem_cell_info_to_nvmem_cell(nvmem, info, &cell); - if (IS_ERR_VALUE(rc)) + if (rc) return rc; return nvmem_cell_write(&cell, buf, cell.bytes); @@ -744,8 +744,7 @@ int nvmem_device_read(struct nvmem_device *nvmem, return 0; rc = nvmem->bus->read(nvmem->priv, offset, buf, bytes); - - if (IS_ERR_VALUE(rc)) + if (rc) return rc; return bytes; @@ -778,8 +777,7 @@ int nvmem_device_write(struct nvmem_device *nvmem, return 0; rc = nvmem->bus->write(nvmem->priv, offset, buf, bytes); - - if (IS_ERR_VALUE(rc)) + if (rc) return rc; |