Home » Mailing list archives » linux-kernel » 2007 » December » 11

[PATCH 6/6] pcmcia/pcnet_cs: Fix 'shadow variable' warning

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Richard Knutsson <ricknu-0@...>
To: <linux-pcmcia@...>
Cc: <kernel-janitors@...>, <linux-kernel@...>, Richard Knutsson <ricknu-0@...>
Subject: [PATCH 6/6] pcmcia/pcnet_cs: Fix 'shadow variable' warning
Date: Tuesday, December 11, 2007 - 12:33 am

Fixing:
  CHECK   drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcmcia/pcnet_cs.c:523:15: warning: symbol 'hw_info' shadows an earlier one
drivers/net/pcmcia/pcnet_cs.c:148:18: originally declared here

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
---


diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index db6a97d..5779344 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -520,7 +520,7 @@ static int pcnet_config(struct pcmcia_device *link)
     int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
     int has_shmem = 0;
     u_short buf[64];
-    hw_info_t *hw_info;
+    hw_info_t *local_hw_info;
     DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
@@ -589,23 +589,23 @@ static int pcnet_config(struct pcmcia_device *link)
 	dev->if_port = 0;
     }
 
-    hw_info = get_hwinfo(link);
-    if (hw_info == NULL)
-	hw_info = get_prom(link);
-    if (hw_info == NULL)
-	hw_info = get_dl10019(link);
-    if (hw_info == NULL)
-	hw_info = get_ax88190(link);
-    if (hw_info == NULL)
-	hw_info = get_hwired(link);
-
-    if (hw_info == NULL) {
+    local_hw_info = get_hwinfo(link);
+    if (local_hw_info == NULL)
+	local_hw_info = get_prom(link);
+    if (local_hw_info == NULL)
+	local_hw_info = get_dl10019(link);
+    if (local_hw_info == NULL)
+	local_hw_info = get_ax88190(link);
+    if (local_hw_info == NULL)
+	local_hw_info = get_hwired(link);
+
+    if (local_hw_info == NULL) {
 	printk(KERN_NOTICE "pcnet_cs: unable to read hardware net"
 	       " address for io base %#3lx\n", dev->base_addr);
 	goto failed;
     }
 
-    info->flags = hw_info->flags;
+    info->flags = local_hw_info->flags;
     /* Check for user overrides */
     info->flags |= (delay_output) ? DELAY_OUTPUT : 0;
     if ((link->manf_id == MANFID_SOCKET) &&
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/6] pcmcia/3c574_cs: Fix dubious bitfield warning, Richard Knutsson, (Tue Dec 11, 12:32 am)
Re: [PATCH 1/6] pcmcia/3c574_cs: Fix dubious bitfield warning, Alan Cox, (Tue Dec 11, 9:19 am)
Re: [PATCH 1/6] pcmcia/3c574_cs: Fix dubious bitfield warning, Richard Knutsson, (Tue Dec 11, 9:40 pm)
[PATCH 6/6] pcmcia/pcnet_cs: Fix 'shadow variable' warning, Richard Knutsson, (Tue Dec 11, 12:33 am)
[PATCH 4/6] pcmcia/axnet_cs: Make use of 'max()' instead of ..., Richard Knutsson, (Tue Dec 11, 12:32 am)
[PATCH 5/6] pcmcia/fmvj18x_cs: Fix 'shadow variable' warning, Richard Knutsson, (Tue Dec 11, 12:32 am)
[PATCH 3/6] pcmcia/axnet_cs: Make functions static, Richard Knutsson, (Tue Dec 11, 12:32 am)
[PATCH 2/6] pcmcia/3c574_cs: Fix 'shadow variable' warning, Richard Knutsson, (Tue Dec 11, 12:32 am)
Re: [PATCH 2/6] pcmcia/3c574_cs: Fix 'shadow variable' warning, Alan Cox, (Tue Dec 11, 9:22 am)