Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1300331

[PATCH] staging-slicoss: Replace variable initialisations by assignments in slic_if_init()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 3 Jan 2016 17:25:59 +0100

Replace explicit initialisation for two local variables at the beginning
by assignments.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/staging/slicoss/slicoss.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index b23a2d1..8fdcac8 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -2301,9 +2301,9 @@ static int slic_adapter_allocresources(struct adapter *adapter,
  */
 static int slic_if_init(struct adapter *adapter, unsigned long *flags)
 {
-	struct sliccard *card = adapter->card;
+	struct sliccard *card;
 	struct net_device *dev = adapter->netdev;
-	__iomem struct slic_regs *slic_regs = adapter->slic_regs;
+	__iomem struct slic_regs *slic_regs;
 	struct slic_shmem *pshmem;
 	int rc;
 
@@ -2348,6 +2348,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
 		adapter->queues_initialized = 1;
 	}
 
+	slic_regs = adapter->slic_regs;
 	slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH);
 	mdelay(1);
 
@@ -2374,6 +2375,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
 	}
 
 	adapter->state = ADAPT_UP;
+	card = adapter->card;
 	if (!card->loadtimerset) {
 		setup_timer(&card->loadtimer, &slic_timer_load_check,
 			    (ulong)card);
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 17:40 +0100
  Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() Julia Lawall <julia.lawall@lip6.fr> - 2016-01-03 17:50 +0100
    Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 18:50 +0100
      Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-03 19:00 +0100
        Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 19:20 +0100
          Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-03 19:30 +0100
            Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 20:00 +0100
              Re: [PATCH] staging-slicoss: Replace variable initialisations by  assignments in slic_if_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-03 20:50 +0100
                Re: staging-slicoss: Replace variable initialisations by assignments  in slic_if_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-03 21:20 +0100
                Re: staging-slicoss: Replace variable initialisations by assignments  in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 21:30 +0100
                Re: staging-slicoss: Replace variable initialisations by assignments  in slic_if_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-01-03 21:20 +0100

csiph-web