git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From e1395a321eab1a7833d82e952eb8255e0a1f03cb Mon Sep 17 00:00:00 2001
   2 From: David Malcolm <dmalcolm@redhat.com>
   3 Date: Tue, 2 Jun 2015 15:31:17 -0400
   4 Subject: drivers/net/ethernet/dec/tulip/uli526x.c: fix misleading indentation in uli526x_timer
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: David Malcolm <dmalcolm@redhat.com>
  10
  11 commit e1395a321eab1a7833d82e952eb8255e0a1f03cb upstream.
  12
  13 This code in drivers/net/ethernet/dec/tulip/uli526x.c
  14 function "uli526x_timer":
  15
  16   1086          } else
  17   1087                  if ((tmp_cr12 & 0x3) && db->link_failed) {
  18   [...snip...]
  19   1109                  }
  20   1110                  else if(!(tmp_cr12 & 0x3) && db->link_failed)
  21   1111                  {
  22   [...snip...]
  23   1117                  }
  24   1118                  db->init=0;
  25
  26 is misleadingly indented: the
  27   db->init=0
  28 is indented as if part of the else clause at line 1086, but it is
  29 independent of it (no braces before the "if" at line 1087).
  30
  31 This patch fixes the indentation to reflect the actual meaning of the code,
  32 though is it actually meant to be part of the "else" clause?  (I'm a
  33 compiler developer, not a kernel person).  It also adds spaces around
  34 the assignment, to placate checkpatch.pl.
  35
  36 Seen via an experimental new gcc warning I'm working on for gcc 6,
  37 -Wmisleading-indentation, using gcc r223098 adding
  38 -Werror=misleading-indentation to KBUILD_CFLAGS in Makefile.
  39 The experimental GCC emits this warning (as an error), rightly IMHO:
  40
  41 drivers/net/ethernet/dec/tulip/uli526x.c: In function ‘uli526x_timer’:
  42 drivers/net/ethernet/dec/tulip/uli526x.c:1118:3: error: statement is
  43 indented as if it were guarded by... [-Werror=misleading-indentation]
  44    db->init=0;
  45     ^
  46 drivers/net/ethernet/dec/tulip/uli526x.c:1086:4: note: ...this ‘else’
  47 clause, but it is not
  48   } else
  49      ^
  50
  51 Hope this is helpful
  52 Dave
  53
  54 Signed-off-by: David Malcolm <dmalcolm@redhat.com>
  55 Signed-off-by: David S. Miller <davem@davemloft.net>
  56 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  57
  58 ---
  59  drivers/net/ethernet/dec/tulip/uli526x.c |    2 +-
  60  1 file changed, 1 insertion(+), 1 deletion(-)
  61
  62 --- a/drivers/net/ethernet/dec/tulip/uli526x.c
  63 +++ b/drivers/net/ethernet/dec/tulip/uli526x.c
  64 @@ -1115,7 +1115,7 @@ static void uli526x_timer(unsigned long
  65                                 netif_carrier_off(dev);
  66                         }
  67                 }
  68 -               db->init=0;
  69 +       db->init = 0;
  70
  71         /* Timer active again */
  72         db->timer.expires = ULI526X_TIMER_WUT;