Skip to contentSkip to conversation

Staging: octeon-hcd: removed unwanted return from void functions

PATCH Superseded Nitin Kuppelur 4 participants 7 messages Sep 8, 2014 – Sep 9, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: octeon-hcd: removed unwanted return from void functions

This is a patch to the octeon-hcd.c file that fixes checkpatch.pl warning by removing return statement from void functions.

---
 drivers/staging/octeon-usb/octeon-hcd.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/staging/octeon-usb/octeon-hcd.c +0 -9
index 3a5feb4..8a80982 100644
@@ -1332,8 +1332,6 @@ static void __cvmx_usb_poll_rx_fifo(struct cvmx_usb_state *usb)
 		bytes -= 4;
 	}
 	CVMX_SYNCW;
-
-	return;
 }
 
 
@@ -1437,8 +1435,6 @@ static void __cvmx_usb_poll_tx_fifo(struct cvmx_usb_state *usb)
 					union cvmx_usbcx_gintmsk,
 					nptxfempmsk, 0);
 	}
-
-	return;
 }
 
 
@@ -1490,8 +1486,6 @@ static void __cvmx_usb_fill_tx_fifo(struct cvmx_usb_state *usb, int channel)
 		fifo->head = 0;
 
 	__cvmx_usb_poll_tx_fifo(usb);
-
-	return;
 }
 
 /**
@@ -1640,7 +1634,6 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
 
 	__cvmx_usb_write_csr32(usb, CVMX_USBCX_HCTSIZX(channel, usb->index),
 			       usbc_hctsiz.u32);
-	return;
 }
 
 
@@ -1987,7 +1980,6 @@ static void __cvmx_usb_start_channel(struct cvmx_usb_state *usb,
 			union cvmx_usbcx_hccharx, chena, 1);
 	if (usb->init_flags & CVMX_USB_INITIALIZE_FLAGS_NO_DMA)
 		__cvmx_usb_fill_tx_fifo(usb, channel);
-	return;
 }
 
 
@@ -2116,7 +2108,6 @@ done:
 	}
 	USB_SET_FIELD32(CVMX_USBCX_GINTMSK(usb->index),
 			union cvmx_usbcx_gintmsk, sofmsk, need_sof);
-	return;
 }
 
 static inline struct octeon_hcd *cvmx_usb_to_octeon(struct cvmx_usb_state *p)
Signature · 1 line
1.9.1
#1 lore raw
Quoted 1 line · Nitin Kuppelur

This is a patch to the octeon-hcd.c file that fixes checkpatch.pl warning by removing return statement from void functions.

Please format line length to <= 76 characters in the commit log.

Maybe you could fix __cvmx_usb_perform_complete() as well?

A.

maintainer
#2 lore raw
Quoted 6 lines · Aaro Koskinen
Quoted 1 line · Nitin Kuppelur

This is a patch to the octeon-hcd.c file that fixes checkpatch.pl warning by removing return statement from void functions.

Please format line length to <= 76 characters in the commit log.

Maybe you could fix __cvmx_usb_perform_complete() as well?

What is wrong with it? That should be in a separate patch...

thanks,

greg k-h

#3 lore raw

Hi,

Quoted 9 lines · Greg KH
Quoted 6 lines · Aaro Koskinen
Quoted 1 line · Nitin Kuppelur

This is a patch to the octeon-hcd.c file that fixes checkpatch.pl warning by removing return statement from void functions.

Please format line length to <= 76 characters in the commit log.

Maybe you could fix __cvmx_usb_perform_complete() as well?

What is wrong with it? That should be in a separate patch...

There's "return;" at the end of void function. I thought the patch was about that, however it seems checkpatch.pl does not seem complain about that.

A.

#4 lore raw
In reply to Aaro Koskinen

Hi Aaro,

Thanks for review. I will correct the commit log length and resend the patch.

About the __cvmx_usb_perform_complete():
Here return statement has associated label. Due to which it will add compilation warning. So I am not handling this.

Note:
Also checkpatch.pl does not complain about this.

Regards,
Nitin

Quoted 6 lines

Please format line length to <= 76 characters in the commit log.

Maybe you could fix __cvmx_usb_perform_complete() as well?

A.

#5 lore raw

PATCH v2 1/1 Staging: octeon-hcd: removed unwanted return from void

This is a patch to the octeon-hcd.c file that fixes checkpatch.pl warning by removing return statement from void functions.

---
 drivers/staging/octeon-usb/octeon-hcd.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/staging/octeon-usb/octeon-hcd.c +0 -9
index 3a5feb4..8a80982 100644
@@ -1332,8 +1332,6 @@ static void __cvmx_usb_poll_rx_fifo(struct cvmx_usb_state *usb)
 		bytes -= 4;
 	}
 	CVMX_SYNCW;
-
-	return;
 }
 
 
@@ -1437,8 +1435,6 @@ static void __cvmx_usb_poll_tx_fifo(struct cvmx_usb_state *usb)
 					union cvmx_usbcx_gintmsk,
 					nptxfempmsk, 0);
 	}
-
-	return;
 }
 
 
@@ -1490,8 +1486,6 @@ static void __cvmx_usb_fill_tx_fifo(struct cvmx_usb_state *usb, int channel)
 		fifo->head = 0;
 
 	__cvmx_usb_poll_tx_fifo(usb);
-
-	return;
 }
 
 /**
@@ -1640,7 +1634,6 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
 
 	__cvmx_usb_write_csr32(usb, CVMX_USBCX_HCTSIZX(channel, usb->index),
 			       usbc_hctsiz.u32);
-	return;
 }
 
 
@@ -1987,7 +1980,6 @@ static void __cvmx_usb_start_channel(struct cvmx_usb_state *usb,
 			union cvmx_usbcx_hccharx, chena, 1);
 	if (usb->init_flags & CVMX_USB_INITIALIZE_FLAGS_NO_DMA)
 		__cvmx_usb_fill_tx_fifo(usb, channel);
-	return;
 }
 
 
@@ -2116,7 +2108,6 @@ done:
 	}
 	USB_SET_FIELD32(CVMX_USBCX_GINTMSK(usb->index),
 			union cvmx_usbcx_gintmsk, sofmsk, need_sof);
-	return;
 }
 
 static inline struct octeon_hcd *cvmx_usb_to_octeon(struct cvmx_usb_state *p)
Signature · 1 line
1.9.1
#6 lore raw
In reply to Nitin Kuppelur
Quoted 7 lines · Nitin Kuppelur

Hi Aaro,

Thanks for review. I will correct the commit log length and resend the patch.

About the __cvmx_usb_perform_complete():
Here return statement has associated label. Due to which it will add compilation warning. So I am not handling this.

Just remove the label as well. Do-nothing labels are a plague.

regards,
dan carpenter