Skip to contentSkip to conversation

staging: axis-fifo: Alignment should match open parenthesis

PATCH In review Bartłomiej Konecki 2 participants 3 messages Oct 12, 2023 – Oct 13, 2023 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: axis-fifo: Alignment should match open parenthesis

Fix 2 checks reported by checkpatch.pl in axis-fifo.c for alignment should match open parenthesis

---
 drivers/staging/axis-fifo/axis-fifo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/axis-fifo/axis-fifo.c +5 -5
index 727b956aa231..ab758a527261 100644
@@ -381,8 +381,8 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf,
 		 */
 		mutex_lock(&fifo->read_lock);
 		ret = wait_event_interruptible_timeout(fifo->read_queue,
-			ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
-			read_timeout);
+						       ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
+						       read_timeout);
 
 		if (ret <= 0) {
 			if (ret == 0) {
@@ -522,9 +522,9 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf,
 		 */
 		mutex_lock(&fifo->write_lock);
 		ret = wait_event_interruptible_timeout(fifo->write_queue,
-			ioread32(fifo->base_addr + XLLF_TDFV_OFFSET)
-				 >= words_to_write,
-			write_timeout);
+						       ioread32(fifo->base_addr + XLLF_TDFV_OFFSET)
+								>= words_to_write,
+						       write_timeout);
 
 		if (ret <= 0) {
 			if (ret == 0) {
Signature · 1 line
2.39.2
maintainer
#1 lore raw
Quoted 7 lines · Bartłomiej Konecki

Fix 2 checks reported by checkpatch.pl in axis-fifo.c for alignment should match open parenthesis

---
 drivers/staging/axis-fifo/axis-fifo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Any specific reason you didn't cc: the staging mailing list like scripts/get_maintainer.pl suggested you do?

drivers/staging/axis-fifo/axis-fifo.c static ssize_t axis_fifo_read(struct file *f, char __user *buf, · line 385

Quoted 13 lines
drivers/staging/axis-fifo/axis-fifo.c +2 -2
index 727b956aa231..ab758a527261 100644
@@ -381,8 +381,8 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf,
 		 */
 		mutex_lock(&fifo->read_lock);
 		ret = wait_event_interruptible_timeout(fifo->read_queue,
-			ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
-			read_timeout);
+						       ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
+						       read_timeout);

Does this now go over the max line length limit? Does this patch pass checkpatch.pl?

thanks,

greg k-h

#2 lore raw

Dnia Thu, Oct 12, 2023 at 02:20:04PM +0200, Greg KH napisał(a):

Quoted 29 lines · Bartłomiej Konecki
Quoted 7 lines

Fix 2 checks reported by checkpatch.pl in axis-fifo.c for alignment should match open parenthesis

---
 drivers/staging/axis-fifo/axis-fifo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Any specific reason you didn't cc: the staging mailing list like scripts/get_maintainer.pl suggested you do?

drivers/staging/axis-fifo/axis-fifo.c static ssize_t axis_fifo_read(struct file *f, char __user *buf, · line 385

Quoted 13 lines
drivers/staging/axis-fifo/axis-fifo.c +2 -2
index 727b956aa231..ab758a527261 100644
@@ -381,8 +381,8 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf,
 		 */
 		mutex_lock(&fifo->read_lock);
 		ret = wait_event_interruptible_timeout(fifo->read_queue,
-			ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
-			read_timeout);
+						       ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
+						       read_timeout);

Does this now go over the max line length limit? Does this patch pass checkpatch.pl?

Quoted 3 lines

thanks,

greg k-h

I have no reason to not include staging mailing list. I fixed my mistake.

Patch lines do not have more than 54 characters, but one of line ends at column 100 and other at col 99.

After this patch there are no more 'Alignment should match open parenthesis' errors from checkpatch.pl.
checkpatch.pl gives one more error connected to documentation in this file, but it should be treated in separate commit and I am not sure how to resolve it:

WARNING: DT compatible string "xlnx,axi-fifo-mm-s-4.1" appears un-documented -- check ./Documentation/devicetree/bindings/ #916: FILE: drivers/staging/axis-fifo/axis-fifo.c:916:
+ { .compatible = "xlnx,axi-fifo-mm-s-4.1", },

Thank you
Bart