staging: ft1000-usb: checkpatch fixes
cover staging: ft1000-usb: checkpatch fixes
Fixed checkpatch style issues.
Peter Karlsson (5):
staging: ft1000-usb: Fixed some issues with lines over 80 characters
staging: ft1000-usb: Fixed some issues with lines over 80 characters
staging: ft1000-usb: Fixed some issues with lines over 80 characters
staging: ft1000-usb: Fixed some issues with lines over 80 characters
staging: ft1000-usb: Removed CVS keyword marker.
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 55 ++++++++++++++-------- .../staging/ft1000/ft1000-usb/ft1000_download.c | 41 ++++++++-------- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 15 +++--- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 12 ++--- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 2 - 5 files changed, 70 insertions(+), 55 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/5 staging: ft1000-usb: Fixed some issues with lines over 80 characters
Fix checkpatch warnings about lines over 80 characters.
--- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 55 +++++++++++++++--------- 1 file changed, 35 insertions(+), 20 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +35 -20
@@ -6,12 +6,12 @@* * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) any -* later version. This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. You should have received a copy of the GNU General Public -* License along with this program; if not, write to the +* Software Foundation; either version 2 of the License, or (at your option) +* any later version. This program is distributed in the hope that it will be +* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +* Public License for more details. You should have received a copy of the GNU +* General Public License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. *---------------------------------------------------------------------------
@@ -103,9 +103,6 @@ struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist)return ptr; } - - -/* *--------------------------------------------------------------------------- * Function: ft1000_free_buffer
@@ -260,7 +257,9 @@ void ft1000_destroy_dev(struct net_device *netdev)/* Make sure we free any memory reserve for slow Queue */ for (i =0 ; i <MAX_NUM_APP ; i++) {while (list_empty (&dev->app_info[i].app_sqlist) ==0 ) { - pdpram_blk = list_entry(dev->app_info[i].app_sqlist.next, struct dpram_blk, list); + pdpram_blk =list_entry ( + dev->app_info[i].app_sqlist.next, + struct dpram_blk, list);list_del (&pdpram_blk->list);ft1000_free_buffer (pdpram_blk, &freercvpool);
@@ -271,7 +270,8 @@ void ft1000_destroy_dev(struct net_device *netdev)/* Remove buffer allocated for receive command data */ if (ft1000_flarion_cnt ==0 ) {while (list_empty (&freercvpool) ==0 ) { - ptr = list_entry(freercvpool.next, struct dpram_blk, list); + ptr =list_entry (freercvpool.next, + struct dpram_blk, list);list_del (&ptr->list);kfree (ptr->pbuffer);kfree (ptr);
@@ -414,12 +414,20 @@ static long ft1000_ioctl(struct file *file, unsigned int command,unsigned long flags;struct IOCTL_GET_VER get_ver_data;struct IOCTL_GET_DSP_STAT get_stat_data; -u8 ConnectionMsg[] = {0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,0x93 ,0x64 , -0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 ,0x00 ,0x00 ,0x00 ,0x0a , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x12 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x02 ,0x37 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x01 ,0x7f ,0x00 , -0x00 ,0x01 ,0x00 ,0x00 }; +u8 ConnectionMsg[] = { +0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 , +0x93 ,0x64 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 , +0x00 ,0x00 ,0x00 ,0x0a ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x12 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x02 ,0x37 ,0x00 ,0x00 , +0x00 ,0x08 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 , +0x01 ,0x7f ,0x00 ,0x00 ,0x01 ,0x00 ,0x00 + };unsigned short ledStat =0 ;unsigned short conStat =0 ;
@@ -494,10 +502,16 @@ static long ft1000_ioctl(struct file *file, unsigned int command,memcpy (get_stat_data.eui64, info->eui64,EUISZ );if (info->ProgConStat !=0xFF ) { -ft1000_read_dpram16 (ft1000dev,FT1000_MAG_DSP_LED , (u8 *)&ledStat,FT1000_MAG_DSP_LED_INDX ); +ft1000_read_dpram16 (ft1000dev, +FT1000_MAG_DSP_LED , + (u8 *)&ledStat, +FT1000_MAG_DSP_LED_INDX ); get_stat_data.LedStat =ntohs (ledStat);pr_debug ("LedStat = 0x%x\n" , get_stat_data.LedStat); -ft1000_read_dpram16 (ft1000dev,FT1000_MAG_DSP_CON_STATE , (u8 *)&conStat,FT1000_MAG_DSP_CON_STATE_INDX ); +ft1000_read_dpram16 (ft1000dev, +FT1000_MAG_DSP_CON_STATE , + (u8 *)&conStat, +FT1000_MAG_DSP_CON_STATE_INDX ); get_stat_data.ConStat =ntohs (conStat);pr_debug ("ConStat = 0x%x\n" , get_stat_data.ConStat); }else {
@@ -687,7 +701,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,if (list_empty (&ft1000dev->app_info[i].app_sqlist) ==0 ) {/* pr_debug("Message detected in slow queue\n"); */ spin_lock_irqsave (&free_buff_lock, flags); - pdpram_blk = list_entry(ft1000dev->app_info[i].app_sqlist.next, struct dpram_blk, list); + pdpram_blk =list_entry (ft1000dev->app_info[i].app_sqlist.next, + struct dpram_blk, list);list_del (&pdpram_blk->list); ft1000dev->app_info[i].NumOfMsg--;/* pr_debug("NumOfMsg for app %d = %d\n", i, ft1000dev->app_info[i].NumOfMsg); */
Signature · 1 line
1.9.1
Re: [PATCH 1/5] staging: ft1000-usb: Fixed some issues with lines over 80 characters
Quoted 1 line · Peter Karlsson
Fix checkpatch warnings about lines over 80 characters.
[]
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Quoted 1 line
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +0
-0
[]
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c static long ft1000_ioctl(struct file *file, unsigned int command, · line 419
Quoted 13 lines
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +3
-6@@ -414,12 +414,20 @@ static long ft1000_ioctl(struct file *file, unsigned int command,unsigned long flags;struct IOCTL_GET_VER get_ver_data;struct IOCTL_GET_DSP_STAT get_stat_data; -u8 ConnectionMsg[] = {0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,0x93 ,0x64 , -0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 ,0x00 ,0x00 ,0x00 ,0x0a , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x12 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x02 ,0x37 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x01 ,0x7f ,0x00 , -0x00 ,0x01 ,0x00 ,0x00 }; +u8 ConnectionMsg[] = { +0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,
7 bytes per line is unusual.
8 or 10 is more common.
Re: [PATCH 1/5] staging: ft1000-usb: Fixed some issues with lines over 80 characters
Quoted 5 lines · Joe Perches
Quoted 1 line · Peter Karlsson
Fix checkpatch warnings about lines over 80 characters.
[]
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Quoted 1 line
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +0
-0[]
Quoted 16 lines
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c static long ft1000_ioctl(struct file *file, unsigned int command, · line 419
Quoted 13 lines
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +3
-6@@ -414,12 +414,20 @@ static long ft1000_ioctl(struct file *file, unsigned int command,unsigned long flags;struct IOCTL_GET_VER get_ver_data;struct IOCTL_GET_DSP_STAT get_stat_data; -u8 ConnectionMsg[] = {0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,0x93 ,0x64 , -0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 ,0x00 ,0x00 ,0x00 ,0x0a , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x12 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x02 ,0x37 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x01 ,0x7f ,0x00 , -0x00 ,0x01 ,0x00 ,0x00 }; +u8 ConnectionMsg[] = { +0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,7 bytes per line is unusual.
8 or 10 is more common.
You are right. I guess i should redo the patches. Frans Klaver also pointed out that four commits have the same commit message, which is not good.
Peter
PATCH 2/5 staging: ft1000-usb: Fixed some issues with lines over 80 characters
In reply to Peter KarlssonFix checkpatch warnings about lines over 80 characters.
--- .../staging/ft1000/ft1000-usb/ft1000_download.c | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_download.c +21 -20
@@ -82,29 +82,29 @@#define DWNLD_MAG1_PS_HDR_LOC 0x03struct dsp_file_hdr { -long version_id;/* Version ID of this image format. */ -long package_id;/* Package ID of code release. */ -long build_date;/* Date/time stamp when file was built. */ -long commands_offset;/* Offset to attached commands in Pseudo Hdr format. */ -long loader_offset;/* Offset to bootloader code. */ -long loader_code_address;/* Start address of bootloader. */ -long loader_code_end;/* Where bootloader code ends. */ -long loader_code_size; -long version_data_offset;/* Offset were scrambled version data begins. */ -long version_data_size;/* Size, in words, of scrambled version data. */ -long nDspImages;/* Number of DSP images in file. */ +long version_id;/* Version ID of this image format. */ +long package_id;/* Package ID of code release. */ +long build_date;/* Date/time stamp when file was built. */ +long commands_offset;/* Offset to attached commands in Pseudo Hdr format. */ +long loader_offset;/* Offset to bootloader code. */ +long loader_code_address;/* Start address of bootloader. */ +long loader_code_end;/* Where bootloader code ends. */ +long loader_code_size; +long version_data_offset;/* Offset were scrambled version data begins. */ +long version_data_size;/* Size, in words, of scrambled version data. */ +long nDspImages;/* Number of DSP images in file. */ };#pragma pack(1)struct dsp_image_info { -long coff_date;/* Date/time when DSP Coff image was built. */ -long begin_offset;/* Offset in file where image begins. */ -long end_offset;/* Offset in file where image begins. */ -long run_address;/* On chip Start address of DSP code. */ -long image_size;/* Size of image. */ -long version;/* Embedded version # of DSP code. */ -unsigned short checksum;/* DSP File checksum */ -unsigned short pad1; +long coff_date;/* Date/time when DSP Coff image was built. */ +long begin_offset;/* Offset in file where image begins. */ +long end_offset;/* Offset in file where image begins. */ +long run_address;/* On chip Start address of DSP code. */ +long image_size;/* Size of image. */ +long version;/* Embedded version # of DSP code. */ +unsigned short checksum;/* DSP File checksum */ +unsigned short pad1; };
@@ -180,7 +180,8 @@ static u16 get_handshake(struct ft1000_usb *ft1000dev, u16 expected_value) } status =ft1000_read_dpram16 (ft1000dev, -DWNLD_MAG1_HANDSHAKE_LOC , (u8 *)&handshake,1 ); +DWNLD_MAG1_HANDSHAKE_LOC , + (u8 *)&handshake,1 ); handshake =ntohs (handshake);if (status)
Signature · 1 line
1.9.1
Re: [PATCH 2/5] staging: ft1000-usb: Fixed some issues with lines over 80 characters
drivers/staging/ft1000/ft1000-usb/ft1000_download.c static u16 get_handshake(struct ft1000_usb *ft1000dev, u16 expected_value) · line 184
Quoted 7 lines · Peter Karlsson
drivers/staging/ft1000/ft1000-usb/ft1000_download.c +2
-1@@ -180,7 +180,8 @@ static u16 get_handshake(struct ft1000_usb *ft1000dev, u16 expected_value) } status =ft1000_read_dpram16 (ft1000dev, -DWNLD_MAG1_HANDSHAKE_LOC , (u8 *)&handshake,1 ); +DWNLD_MAG1_HANDSHAKE_LOC , + (u8 *)&handshake,1 );
Do it like this:
status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
regards,
dan carpenter
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH 3/5 staging: ft1000-usb: Fixed some issues with lines over 80 characters
In reply to Peter KarlssonFix checkpatch warnings about lines over 80 characters.
--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +8 -7
@@ -400,7 +400,8 @@ int dsp_reload(struct ft1000_usb *ft1000dev)msleep (1000 ); status = -ft1000_write_register (ft1000dev,HOST_INTF_BE ,FT1000_REG_SUP_CTRL ); +ft1000_write_register (ft1000dev,HOST_INTF_BE , +FT1000_REG_SUP_CTRL );/* Let's check for FEFE */ status =
@@ -587,8 +588,8 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) goto err; } - pipe = -usb_sndbulkpipe (pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr); + pipe =usb_sndbulkpipe (pFt1000Dev->dev, + pFt1000Dev->bulk_out_endpointAddr); maxlen =usb_maxpacket (pFt1000Dev->dev, pipe,usb_pipeout (pipe)); pdata = (u8 *)skb->data;
@@ -1069,9 +1070,8 @@ static int ft1000_dsp_prov(void *arg)pr_debug ("*** Provision Data Sent to DSP\n" );/* Send provisioning data */ - ptr = - list_entry(info->prov_list.next, struct prov_record, - list); + ptr =list_entry (info->prov_list.next, + struct prov_record, list); len = *(u16 *)ptr->pprov_data; len =htons (len); len +=PSEUDOSZ ;
@@ -1258,7 +1258,8 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size) FT1000_REG_DOORBELL);if (tempword &FT1000_DB_DPRAM_TX ) {mdelay (10 ); - status =ft1000_read_register (dev, &tempword, + status =ft1000_read_register (dev, + &tempword,FT1000_REG_DOORBELL );if (tempword &FT1000_DB_DPRAM_TX )break ;
Signature · 1 line
1.9.1
Re: [PATCH 3/5] staging: ft1000-usb: Fixed some issues with lines over 80 characters
Quoted 12 lines · Peter Karlsson
Fix checkpatch warnings about lines over 80 characters.
Signed-off-by Peter Karlsson <[email protected]>--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +0
-0
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c int dsp_reload(struct ft1000_usb *ft1000dev) · line 404
Quoted 6 lines
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +2
-1@@ -400,7 +400,8 @@ int dsp_reload(struct ft1000_usb *ft1000dev)msleep (1000 ); status = -ft1000_write_register (ft1000dev,HOST_INTF_BE ,FT1000_REG_SUP_CTRL ); +ft1000_write_register (ft1000dev,HOST_INTF_BE , +FT1000_REG_SUP_CTRL );
Make all these line up as well (like in other reply).
status = ft1000_write_register(ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
[tab][tab][tab][tab][space][space][space][space][space][space][space]FT1000_REG_SUP_CTRL);
regards,
dan carpenter
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH 4/5 staging: ft1000-usb: Fixed some issues with lines over 80 characters
In reply to Peter KarlssonFix checkpatch warnings about lines over 80 characters.
--- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +6 -6
@@ -6,12 +6,12 @@* * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) any -* later version. This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. You should have received a copy of the GNU General Public -* License along with this program; if not, write to the +* Software Foundation; either version 2 of the License, or (at your option) +* any later version. This program is distributed in the hope that it will be +* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +* Public License for more details. You should have received a copy of the GNU +* General Public License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. *---------------------------------------------------------------------------
Signature · 1 line
1.9.1
PATCH 5/5 staging: ft1000-usb: Removed CVS keyword marker
In reply to Peter KarlssonFix checkpatch warnings about CVS keyword marker.
--- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +0 -2
@@ -3,8 +3,6 @@* * * This file is part of Express Card USB Driver -* -* $Id: *==================================================== */
Signature · 1 line
1.9.1