Re: [PATCH] Staging: rtl8187se: fix spacing errors and commenting format in r8180_93cx6.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Feb 17, 2010 at 02:58:14PM +0000, Richard Colquhoun wrote:
> From 764502ee11ccd601ee7fb6bc00e2333055b9dd41 Mon Sep 17 00:00:00 2001
> From: Richard Colquhoun <arfab28@valen.(none)>
> Date: Wed, 17 Feb 2010 12:32:13 +0000
> Subject: [PATCH] Staging: rtl8187se: fix spacing errors and commenting format in r8180_93cx6.c
>  This patch just fixes all of the errors highlighted by the checkpatch.pl script
>  Signed-off-by: Richard Colquhoun <arfab@xxxxxxxxxxx>
> 
> ---
>  drivers/staging/rtl8187se/r8180_93cx6.c |   81 ++++++++++++++++---------------
>  1 files changed, 41 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/staging/rtl8187se/r8180_93cx6.c b/drivers/staging/rtl8187se/r8180_93cx6.c
> index 7e4711f..51c59cb 100644
> --- a/drivers/staging/rtl8187se/r8180_93cx6.c
> +++ b/drivers/staging/rtl8187se/r8180_93cx6.c
> @@ -22,13 +22,13 @@
>  
>  void eprom_cs(struct net_device *dev, short bit)
>  {
> -	if(bit)
> +	if (bit)
>  		write_nic_byte(dev, EPROM_CMD,
>  			       (1<<EPROM_CS_SHIFT) | \
> -			       read_nic_byte(dev, EPROM_CMD)); //enable EPROM
> +			       read_nic_byte(dev, EPROM_CMD)); #enable EPROM
>  	else
>  		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\
> -			       &~(1<<EPROM_CS_SHIFT)); //disable EPROM
> +			       &~(1<<EPROM_CS_SHIFT)); #disable EPROM
>  
>  	force_pci_posting(dev);
>  	udelay(EPROM_DELAY);
> @@ -38,23 +38,23 @@ void eprom_cs(struct net_device *dev, short bit)
>  void eprom_ck_cycle(struct net_device *dev)
>  {
>  	write_nic_byte(dev, EPROM_CMD,
> -		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev,EPROM_CMD));
> +		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD));
>  	force_pci_posting(dev);
>  	udelay(EPROM_DELAY);
>  	write_nic_byte(dev, EPROM_CMD,
> -		       read_nic_byte(dev, EPROM_CMD) &~ (1<<EPROM_CK_SHIFT));
> +		       read_nic_byte(dev, EPROM_CMD)&~(1<<EPROM_CK_SHIFT));
>  	force_pci_posting(dev);
>  	udelay(EPROM_DELAY);
>  }
>  
>  
> -void eprom_w(struct net_device *dev,short bit)
> +void eprom_w(struct net_device *dev, short bit)
>  {
> -	if(bit)
> +	if (bit)
>  		write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
> -			       read_nic_byte(dev,EPROM_CMD));
> +			       read_nic_byte(dev, EPROM_CMD));
>  	else
> -		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev,EPROM_CMD)\
> +		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\
>  			       &~(1<<EPROM_W_SHIFT));
>  
>  	force_pci_posting(dev);
> @@ -66,11 +66,12 @@ short eprom_r(struct net_device *dev)
>  {
>  	short bit;
>  
> -	bit=(read_nic_byte(dev, EPROM_CMD) & (1<<EPROM_R_SHIFT) );
> +	bit = (read_nic_byte(dev, EPROM_CMD) & (1<<EPROM_R_SHIFT));
>  	udelay(EPROM_DELAY);
>  
> -	if(bit) return 1;
> -	return 0;
> +	if (bit)
> +		return 1;
> +		return 0;
>  }
>  
>  
> @@ -78,7 +79,7 @@ void eprom_send_bits_string(struct net_device *dev, short b[], int len)
>  {
>  	int i;
>  
> -	for(i=0; i<len; i++){
> +	for (i = 0; i < len; i++) {
>  		eprom_w(dev, b[i]);
>  		eprom_ck_cycle(dev);
>  	}
> @@ -88,50 +89,50 @@ void eprom_send_bits_string(struct net_device *dev, short b[], int len)
>  u32 eprom_read(struct net_device *dev, u32 addr)
>  {
>  	struct r8180_priv *priv = ieee80211_priv(dev);
> -	short read_cmd[]={1,1,0};
> +	short read_cmd[] = {1, 1, 0};
>  	short addr_str[8];
>  	int i;
>  	int addr_len;
>  	u32 ret;
>  
> -	ret=0;
> -        //enable EPROM programming
> +	ret = 0;
> +	#enable EPROM programming
>  	write_nic_byte(dev, EPROM_CMD,
>  		       (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT));
>  	force_pci_posting(dev);
>  	udelay(EPROM_DELAY);
>  
> -	if (priv->epromtype==EPROM_93c56){
> -		addr_str[7]=addr & 1;
> -		addr_str[6]=addr & (1<<1);
> -		addr_str[5]=addr & (1<<2);
> -		addr_str[4]=addr & (1<<3);
> -		addr_str[3]=addr & (1<<4);
> -		addr_str[2]=addr & (1<<5);
> -		addr_str[1]=addr & (1<<6);
> -		addr_str[0]=addr & (1<<7);
> -		addr_len=8;
> -	}else{
> -		addr_str[5]=addr & 1;
> -		addr_str[4]=addr & (1<<1);
> -		addr_str[3]=addr & (1<<2);
> -		addr_str[2]=addr & (1<<3);
> -		addr_str[1]=addr & (1<<4);
> -		addr_str[0]=addr & (1<<5);
> -		addr_len=6;
> +	if (priv->epromtype == EPROM_93c56) {
> +		addr_str[7] = addr & 1;
> +		addr_str[6] = addr & (1<<1);
> +		addr_str[5] = addr & (1<<2);
> +		addr_str[4] = addr & (1<<3);
> +		addr_str[3] = addr & (1<<4);
> +		addr_str[2] = addr & (1<<5);
> +		addr_str[1] = addr & (1<<6);
> +		addr_str[0] = addr & (1<<7);
> +		addr_len = 8;
> +	} else{
> +		addr_str[5] = addr & 1;
> +		addr_str[4] = addr & (1<<1);
> +		addr_str[3] = addr & (1<<2);
> +		addr_str[2] = addr & (1<<3);
> +		addr_str[1] = addr & (1<<4);
> +		addr_str[0] = addr & (1<<5);
> +		addr_len = 6;
>  	}
>  	eprom_cs(dev, 1);
>  	eprom_ck_cycle(dev);
>  	eprom_send_bits_string(dev, read_cmd, 3);
>  	eprom_send_bits_string(dev, addr_str, addr_len);
>  
> -	//keep chip pin D to low state while reading.
> -	//I'm unsure if it is necessary, but anyway shouldn't hurt
> +	#keep chip pin D to low state while reading.
> +	#I'm unsure if it is necessary, but anyway shouldn't hurt
>  	eprom_w(dev, 0);
>  
> -	for(i=0;i<16;i++){
> -		//eeprom needs a clk cycle between writing opcode&adr
> -		//and reading data. (eeprom outs a dummy 0)
> +	for (i = 0; i < 16; i++) {
> +		#eeprom needs a clk cycle between writing opcode&adr
> +		#and reading data. (eeprom outs a dummy 0)
>  		eprom_ck_cycle(dev);
>  		ret |= (eprom_r(dev)<<(15-i));
>  	}
> @@ -139,7 +140,7 @@ u32 eprom_read(struct net_device *dev, u32 addr)
>  	eprom_cs(dev, 0);
>  	eprom_ck_cycle(dev);
>  
> -	//disable EPROM programming
> +	#disable EPROM programming
>  	write_nic_byte(dev, EPROM_CMD,
>  		       (EPROM_CMD_NORMAL<<EPROM_CMD_OPERATING_MODE_SHIFT));
>  	return ret;
> -- 
> 1.6.3.3

Looks good besides just one part and I guess that's just me may be: In some cases where you put a # put a space between the # and the comment. Thanks.

Reviewed-by: Vikram Dhillon <opensolarisdev@xxxxxxxxx>
 
-- 
Regards,
Vikram Dhillon

There is poetry and there is beauty in real sympathy; but there is more — there is action. The noblest and most powerful form of sympathy is not merely the responsive tear, the echoed sigh, the answering look; it is the embodiment of the sentiment in actual help. 

Attachment: signature.asc
Description: Digital signature

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux