From: Bilel DRIRA <bilel.dr@gmail•com>
To: marek.belisko@gmail•com, gregkh@linuxfoundation•org,
joe@perches•com, tapaswenipathak@gmail•com, gdonald@gmail•com,
aybuke.147@gmail•com, devel@driverdev•osuosl.org,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
Cc: Bilel DRIRA <bilel.dr@gmail•com>
Subject: [PATCH v2 ] staging: ft1000: fix else style error
Date: Tue, 13 Jan 2015 22:34:00 +0100 [thread overview]
Message-ID: <1421184840-24108-1-git-send-email-bilel.dr@gmail.com> (raw)
This patch fix the checkpatch.pl error:
ERROR: else should follow close brace '}'
Signed-off-by: Bilel DRIRA <bilel.dr@gmail•com>
---
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(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index e9a37ee..4b830ac 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -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;
--
1.7.9.5
next reply other threads:[~2015-01-13 21:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 21:34 Bilel DRIRA [this message]
2015-01-17 23:23 ` [PATCH v2 ] staging: ft1000: fix else style error Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421184840-24108-1-git-send-email-bilel.dr@gmail.com \
--to=bilel.dr@gmail$(echo .)com \
--cc=aybuke.147@gmail$(echo .)com \
--cc=devel@driverdev$(echo .)osuosl.org \
--cc=gdonald@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marek.belisko@gmail$(echo .)com \
--cc=tapaswenipathak@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox