[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260206131148.13643-3-gustavopiazdasilva2102@gmail.com>
Date: Fri, 6 Feb 2026 10:11:48 -0300
From: Gustavo Piaz da Silva <gustavopiazdasilva2102@...il.com>
To: gregkh@...uxfoundation.org,
dan.carpenter@...aro.org
Cc: ovidiu.panait.oss@...il.com,
gshahrouzi@...il.com,
linux-staging@...ts.linux.dev,
linux-kernel@...r.kernel.org,
Gustavo Piaz da Silva <gustavopiazdasilva2102@...il.com>
Subject: [PATCH v7 2/2] staging: axis-fifo: refactor device tree parsing
Refactor the device tree parsing logic in axis_fifo_probe() to reduce
verbosity and simplify error handling.
Remove the verbose error logging and goto logic. Instead, check
of_property_read_u32() return values directly and propagate error codes
immediately. This aligns the driver with modern kernel standards by
removing unnecessary error messages during probe.
Signed-off-by: Gustavo Piaz da Silva <gustavopiazdasilva2102@...il.com>
---
Changes in v7:
- Reverted variable name and type from 'u32 width' back to the
original 'unsigned int value' to minimize unnecessary diff noise.
- Removed extra blank lines between function calls and error
checks to keep the diff as compact as possible.
Changes in v6:
- Removed the axis_fifo_get_u32() helper function entirely.
- Removed all dev_err() calls in axis_fifo_parse_dt() as the
driver core already reports probe failures.
- Kept the 'node' local variable to avoid checkpatch line
length warnings.
- Fixed checkpatch style warning (missing blank line after
declarations).
- Ensured a newline exists at the end of the file.
Changes in v5:
- Added missing newline at the end of axis-fifo.c.
Changes in v4:
- Removed extra blank lines in the commit message.
- Added "rx" and "tx" prefixes to error messages (these
messages were later removed in v6).
Changes in v3:
- Split the original monolithic v2 patch into two separate
patches to isolate logic refactoring from type alignment.
Changes in v2:
- Fixed checkpatch.pl coding style issues regarding
indents and line formatting.
Changes in v1:
- Initial submission.
drivers/staging/axis-fifo/axis-fifo.c | 73 +++++++++------------------
1 file changed, 23 insertions(+), 50 deletions(-)
diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index 7bc7bf191250..8141f8d02a98 100644
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -488,62 +488,35 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo)
unsigned int value;
struct device_node *node = fifo->dt_device->of_node;
- ret = of_property_read_u32(node, "xlnx,axi-str-rxd-tdata-width",
- &value);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,axi-str-rxd-tdata-width property\n");
- goto end;
- } else if (value != 32) {
- dev_err(fifo->dt_device, "xlnx,axi-str-rxd-tdata-width only supports 32 bits\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,axi-str-rxd-tdata-width", &value);
+ if (ret)
+ return ret;
+ if (value != 32)
+ return -EINVAL;
- ret = of_property_read_u32(node, "xlnx,axi-str-txd-tdata-width",
- &value);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,axi-str-txd-tdata-width property\n");
- goto end;
- } else if (value != 32) {
- dev_err(fifo->dt_device, "xlnx,axi-str-txd-tdata-width only supports 32 bits\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,axi-str-txd-tdata-width", &value);
+ if (ret)
+ return ret;
+ if (value != 32)
+ return -EINVAL;
- ret = of_property_read_u32(node, "xlnx,rx-fifo-depth",
- &fifo->rx_fifo_depth);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,rx-fifo-depth property\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,rx-fifo-depth", &fifo->rx_fifo_depth);
+ if (ret)
+ return ret;
- ret = of_property_read_u32(node, "xlnx,tx-fifo-depth",
- &fifo->tx_fifo_depth);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,tx-fifo-depth property\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,tx-fifo-depth", &fifo->tx_fifo_depth);
+ if (ret)
+ return ret;
- ret = of_property_read_u32(node, "xlnx,use-rx-data",
- &fifo->has_rx_fifo);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,use-rx-data property\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,use-rx-data", &fifo->has_rx_fifo);
+ if (ret)
+ return ret;
- ret = of_property_read_u32(node, "xlnx,use-tx-data",
- &fifo->has_tx_fifo);
- if (ret) {
- dev_err(fifo->dt_device, "missing xlnx,use-tx-data property\n");
- ret = -EIO;
- goto end;
- }
+ ret = of_property_read_u32(node, "xlnx,use-tx-data", &fifo->has_tx_fifo);
+ if (ret)
+ return ret;
-end:
- return ret;
+ return 0;
}
static int axis_fifo_probe(struct platform_device *pdev)
--
2.52.0
Powered by blists - more mailing lists