staging: ft1000: fix else style error
Subsystems (2)
PATCH v2 1/1 staging: ft1000: fix else style error
This patch fix the checkpatch.pl error:
ERROR: else should follow close brace '}'
Signed-off-by Bilel DRIRA <[email protected]>
---
v2: remove braces instead of just putting else after close brace. (suggested by Joe Perches).
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 29 ++++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-)
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +10 -19
@@ -570,12 +570,10 @@ static void ft1000_hbchk(u_long data)pr_debug ("hi_ho value = 0x%x\n" , tempword);/* Let's perform another check if ho is not detected */ if (tempword != ho) { -if (info->AsicID ==ELECTRABUZZ_ID ) { +if (info->AsicID ==ELECTRABUZZ_ID ) tempword =ft1000_read_dpram (dev,FT1000_HI_HO ); - } -else { +else tempword =ntohs (ft1000_read_dpram_mag_16 (dev,FT1000_MAG_HI_HO ,FT1000_MAG_HI_HO_INDX )); - } }if (tempword != ho) {pr_info ("heartbeat failed - no ho detected\n" );
@@ -686,20 +684,15 @@ static void ft1000_hbchk(u_long data) }/* Let's write hi again if fail */ if (tempword != hi) { -if (info->AsicID ==ELECTRABUZZ_ID ) { +if (info->AsicID ==ELECTRABUZZ_ID )ft1000_write_dpram (dev,FT1000_HI_HO , hi); - } -else { +else ft1000_write_dpram_mag_16 (dev,FT1000_MAG_HI_HO , hi_mag,FT1000_MAG_HI_HO_INDX ); - } -if (info->AsicID ==ELECTRABUZZ_ID ) { +if (info->AsicID ==ELECTRABUZZ_ID ) tempword =ft1000_read_dpram (dev,FT1000_HI_HO ); - } -else { +else tempword =ntohs (ft1000_read_dpram_mag_16 (dev,FT1000_MAG_HI_HO ,FT1000_MAG_HI_HO_INDX )); - } - }if (tempword != hi) {
@@ -957,12 +950,11 @@ static void ft1000_proc_drvmsg(struct net_device *dev)u16 wrd; } convert; -if (info->AsicID ==ELECTRABUZZ_ID ) { +if (info->AsicID ==ELECTRABUZZ_ID ) tempword =FT1000_DPRAM_RX_BASE +2 ; - } -else { +else tempword =FT1000_DPRAM_MAG_RX_BASE ; - } +if (ft1000_receive_cmd (dev, &cmdbuffer[0 ],MAX_CMD_SQSIZE , &tempword)) {/* Get the message type which is total_len + PSEUDO header + msgtype + message body */
@@ -1039,8 +1031,7 @@ static void ft1000_proc_drvmsg(struct net_device *dev) info->ConTm =0 ; } } - } -else { + }else {pr_debug ("Media is down\n" );if (info->mediastate ==1 ) { info->mediastate =0 ;
Signature · 1 line
1.7.9.5
Greg KH
maintainerQuoted 10 lines · Bilel DRIRA
This patch fix the checkpatch.pl error:
ERROR: else should follow close brace '}'
Signed-off-by Bilel DRIRA <[email protected]>---
v2: remove braces instead of just putting else after close brace. (suggested by Joe Perches).drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 29 ++++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-)
Doesn't apply to my tree due to changes from other developers before you in this area, sorry.
greg k-h