Skip to contentSkip to conversation

staging: axis-fifo: fix grammar in Kconfig help text

PATCH In review Josh Law 3 participants 8 messages Mar 1 Staging

lore
Share & tools
lore

Josh Law

author
#0 lore raw

PATCH 1/4 staging: axis-fifo: fix grammar in Kconfig help text

Use 'an' instead of 'a' before 'AXI' since it begins with a vowel sound.

---
 drivers/staging/axis-fifo/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/axis-fifo/Kconfig +1 -1
index f180a8e9f58a..e618f275e283 100644
@@ -7,6 +7,6 @@ config XIL_AXIS_FIFO
 	depends on OF && HAS_IOMEM
 	help
 	  This adds support for the Xilinx AXI-Stream FIFO IP core driver.
-	  The AXI Streaming FIFO allows memory mapped access to a AXI Streaming
+	  The AXI Streaming FIFO allows memory mapped access to an AXI Streaming
 	  interface. The Xilinx AXI-Stream FIFO IP core can be used to interface
 	  to the AXI Ethernet without the need to use DMA.
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 2/4 staging: axis-fifo: use lowercase hex constant for consistency

All other register offset defines use lowercase hex digits. Change 0x2C to 0x2c for XLLF_TDR_OFFSET to match the rest of the file.

---
 drivers/staging/axis-fifo/axis-fifo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/axis-fifo/axis-fifo.c +1 -1
index d5533235cefc..e154139831ea 100644
@@ -46,7 +46,7 @@
 #define XLLF_RDFD_OFFSET	0x20 /* Receive Data */
 #define XLLF_RLR_OFFSET		0x24 /* Receive Length */
 #define XLLF_SRR_OFFSET		0x28 /* Local Link Reset */
-#define XLLF_TDR_OFFSET		0x2C /* Transmit Destination */
+#define XLLF_TDR_OFFSET		0x2c /* Transmit Destination */
 #define XLLF_RDR_OFFSET		0x30 /* Receive Destination */
 
 #define XLLF_RDFR_RESET_MASK	0xa5 /* Receive reset value */
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH 3/4 staging: axis-fifo: remove unnecessary variable initializations

In reply to Josh Law

Remove the unnecessary initialization of 'fifo' to NULL and 'rc' to 0 in axis_fifo_probe(), as both variables are assigned before their first use.

---
 drivers/staging/axis-fifo/axis-fifo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/axis-fifo/axis-fifo.c +2 -2
index e154139831ea..7ca0404b0875 100644
@@ -456,8 +456,8 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo)
 static int axis_fifo_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
-	struct axis_fifo *fifo = NULL;
-	int rc = 0; /* error return value */
+	struct axis_fifo *fifo;
+	int rc;
 	int irq;
 
 	fifo = devm_kzalloc(dev, sizeof(*fifo), GFP_KERNEL);
Signature · 1 line
2.43.0
author
#3 lore raw

PATCH 4/4 staging: axis-fifo: simplify error returns in axis_fifo_parse_dt()

In reply to Josh Law

Replace redundant 'ret = -EIO; return ret;' patterns with direct 'return -EIO;' statements, and change the final 'return ret;' to 'return 0;' since success is the only path that reaches it.

---
 drivers/staging/axis-fifo/axis-fifo.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/staging/axis-fifo/axis-fifo.c +7 -13
index 7ca0404b0875..9aeb16d8a71f 100644
@@ -403,8 +403,7 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo)
 		return ret;
 	} else if (value != 32) {
 		dev_err(fifo->dt_device, "xlnx,axi-str-rxd-tdata-width only supports 32 bits\n");
-		ret = -EIO;
-		return ret;
+		return -EIO;
 	}
 
 	ret = of_property_read_u32(node, "xlnx,axi-str-txd-tdata-width",
@@ -414,43 +413,38 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo)
 		return ret;
 	} else if (value != 32) {
 		dev_err(fifo->dt_device, "xlnx,axi-str-txd-tdata-width only supports 32 bits\n");
-		ret = -EIO;
-		return ret;
+		return -EIO;
 	}
 
 	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;
-		return ret;
+		return -EIO;
 	}
 
 	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;
-		return ret;
+		return -EIO;
 	}
 
 	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;
-		return ret;
+		return -EIO;
 	}
 
 	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;
-		return ret;
+		return -EIO;
 	}
 
-	return ret;
+	return 0;
 }
 
 static int axis_fifo_probe(struct platform_device *pdev)
Signature · 1 line
2.43.0
author
#5 lore raw

Hello, are you still going to merge my patch? I am new to this, and I hate using my Gmail to merge stuff like this (bit unprofessional lol), I am sorry for the inconvenience, because my objecting.org email can't send emails

V/R

1 Mar 2026 18:46:30 Ethan Tidmore <[email protected]>:

Quoted 14 lines · Josh Law
Quoted 4 lines

Use 'an' instead of 'a' before 'AXI' since it begins with a vowel sound.

---

Your email client isn't setup correctly. :(

WARNING: From:/Signed-off-by: email address mismatch:
'From: Josh Law <[email protected]>' != 'Signed-off-by: Josh Law <[email protected]>'

Thanks,

ET

#6 lore raw
Quoted 2 lines · Josh Law

Hello, are you still going to merge my patch? I am new to this, and I hate using my Gmail to merge stuff like this (bit unprofessional lol), I am sorry for the inconvenience, because my objecting.org email can't send emails

Please stop top posting, reply inline like how I'm doing here. Also, I don't merge patches I'm just a reviewer, Greg KH merges them.

About gmail, it is not unprofessional at all. Lots of people even maintainers use it.

Simply put, if your From: and your SOB don't match your patch will not be accepted and Greg will not manually fix it for you. You're going to have to send a v2.

Read this on which email clients you could use:

Documentation/process/email-clients.rst

And here is a source on how to send a v2:

https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/

Thanks,

ET

#7 lore raw
In reply to Josh Law
Quoted 2 lines · Josh Law

Hello, are you still going to merge my patch? I am new to this, and I hate using my Gmail to merge stuff like this (bit unprofessional lol), I am sorry for the inconvenience, because my objecting.org email can't send emails

Have you ever tried sending patches to your objecting.org address and applying them?

Signature · 1 line
An old man doll... just what I always wanted! - Clara