lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pcmcia/pcnet_cs: fix 'shadow variable' warning

Browse Source 
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>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Richard Knutsson
2008-02-04 22:27:42 -08:00
committed by Linus Torvalds
parent cfd4734c1e
commit 9ab9898e32
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/pcmcia/pcnet_cs.c
View File

@@ -521,7 +521,7 @@ static int pcnet_config(struct pcmcia_device *link)
int i, last_ret, last_fn, start_pg, stop_pg, cm_offset; int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
int has_shmem = 0; int has_shmem = 0;
u_short buf[64]; u_short buf[64];
hw_info_t *hw_info; hw_info_t *local_hw_info;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
DEBUG(0, "pcnet_config(0x%p)\n", link); DEBUG(0, "pcnet_config(0x%p)\n", link);
@@ -590,23 +590,23 @@ static int pcnet_config(struct pcmcia_device *link)
dev->if_port = 0; dev->if_port = 0;
} }
hw_info = get_hwinfo(link); local_hw_info = get_hwinfo(link);
if (hw_info == NULL) if (local_hw_info == NULL)
hw_info = get_prom(link); local_hw_info = get_prom(link);
if (hw_info == NULL) if (local_hw_info == NULL)
hw_info = get_dl10019(link); local_hw_info = get_dl10019(link);
if (hw_info == NULL) if (local_hw_info == NULL)
hw_info = get_ax88190(link); local_hw_info = get_ax88190(link);
if (hw_info == NULL) if (local_hw_info == NULL)
hw_info = get_hwired(link); local_hw_info = get_hwired(link);
if (hw_info == NULL) { if (local_hw_info == NULL) {
printk(KERN_NOTICE "pcnet_cs: unable to read hardware net" printk(KERN_NOTICE "pcnet_cs: unable to read hardware net"
" address for io base %#3lx\n", dev->base_addr); " address for io base %#3lx\n", dev->base_addr);
goto failed; goto failed;
} }
info->flags = hw_info->flags; info->flags = local_hw_info->flags;
/* Check for user overrides */ /* Check for user overrides */
info->flags |= (delay_output) ? DELAY_OUTPUT : 0; info->flags |= (delay_output) ? DELAY_OUTPUT : 0;
if ((link->manf_id == MANFID_SOCKET) && if ((link->manf_id == MANFID_SOCKET) &&