leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: ft1000-pcmcia: fix else close brace style

Browse Source 
Fix the following checkpatch.pl errors

ERROR: else should follow close brace '}'
+                       }
+                       else {

ERROR: else should follow close brace '}'
+                       }
+                       else {

ERROR: else should follow close brace '}'
+                       }
+                       else {

ERROR: else should follow close brace '}'
+       }
+       else {

ERROR: else should follow close brace '}'
+                       }
+                       else {

Signed-off-by: Austin Kerbow <amkerbow@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Austin Kerbow 2015-01-01 20:29:56 -08:00 committed by Greg Kroah-Hartman
parent 64ed8f51f9
commit fa2592cdc5
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
View File

@ -570,12 +570,12 @@ static void ft1000_hbchk(u_long data)
pr_debug("hi_ho value = 0x%x\n", tempword); pr_debug("hi_ho value = 0x%x\n", tempword);
/* Let's perform another check if ho is not detected */ /* Let's perform another check if ho is not detected */
if (tempword != ho) { if (tempword != ho) {
if (info->AsicID == ELECTRABUZZ_ID) { if (info->AsicID == ELECTRABUZZ_ID)
tempword = ft1000_read_dpram(dev, FT1000_HI_HO); tempword = ft1000_read_dpram(dev, FT1000_HI_HO);
} else
else { tempword = ntohs(ft1000_read_dpram_mag_16(dev,
tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX)); FT1000_MAG_HI_HO,
} FT1000_MAG_HI_HO_INDX));
} }
if (tempword != ho) { if (tempword != ho) {
pr_info("heartbeat failed - no ho detected\n"); pr_info("heartbeat failed - no ho detected\n");
@ -686,19 +686,15 @@ static void ft1000_hbchk(u_long data)
} }
/* Let's write hi again if fail */ /* Let's write hi again if fail */
if (tempword != hi) { if (tempword != hi) {
if (info->AsicID == ELECTRABUZZ_ID) { if (info->AsicID == ELECTRABUZZ_ID)
ft1000_write_dpram(dev, FT1000_HI_HO, hi); 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); 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); 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)); tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX));
}
} }
@ -957,12 +953,11 @@ static void ft1000_proc_drvmsg(struct net_device *dev)
u16 wrd; u16 wrd;
} convert; } convert;
if (info->AsicID == ELECTRABUZZ_ID) { if (info->AsicID == ELECTRABUZZ_ID)
tempword = FT1000_DPRAM_RX_BASE+2; tempword = FT1000_DPRAM_RX_BASE+2;
} else
else {
tempword = FT1000_DPRAM_MAG_RX_BASE; tempword = FT1000_DPRAM_MAG_RX_BASE;
}
if (ft1000_receive_cmd(dev, &cmdbuffer[0], MAX_CMD_SQSIZE, &tempword)) { if (ft1000_receive_cmd(dev, &cmdbuffer[0], MAX_CMD_SQSIZE, &tempword)) {
/* Get the message type which is total_len + PSEUDO header + msgtype + message body */ /* Get the message type which is total_len + PSEUDO header + msgtype + message body */
@ -1039,8 +1034,7 @@ static void ft1000_proc_drvmsg(struct net_device *dev)
info->ConTm = 0; info->ConTm = 0;
} }
} }
} } else {
else {
pr_debug("Media is down\n"); pr_debug("Media is down\n");
if (info->mediastate == 1) { if (info->mediastate == 1) {
info->mediastate = 0; info->mediastate = 0;