summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-07-07 17:35:16 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-09 12:26:43 -0700
commitb3a87c3767b476a2115a8d9c7aa5496c153d1dc5 (patch)
tree1b9627c64c7179ca65142ae8493ee54c7ad39144
parent3bc2311e32daef1b62f45bc5d1da936f4cb31111 (diff)
downloadblackbird-obmc-linux-b3a87c3767b476a2115a8d9c7aa5496c153d1dc5.tar.gz
blackbird-obmc-linux-b3a87c3767b476a2115a8d9c7aa5496c153d1dc5.zip
staging/ft1000: fix the no brace needed warning in ft1000_read_fifo_len
as the if else statements enclose only one line, so braces around them are not needed. The following warning is fixed drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c:100: WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 0bd080c4f1f7..4a8d6426641e 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -97,11 +97,10 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
{
struct ft1000_info *info = netdev_priv(dev);
- if (info->AsicID == ELECTRABUZZ_ID) {
+ if (info->AsicID == ELECTRABUZZ_ID)
return (ft1000_read_reg(dev, FT1000_REG_UFIFO_STAT) - 16);
- } else {
+ else
return (ft1000_read_reg(dev, FT1000_REG_MAG_UFSR) - 16);
- }
}
//---------------------------------------------------------------------------
OpenPOWER on IntegriCloud