Commit 27ad2cd2 authored by Jason Yan's avatar Jason Yan Committed by David S. Miller

net: tulip: de4x5: make PCI_signature() return void

This function always return 0 now, we can make it return void to
simplify the code. This fixes the following coccicheck warning:

drivers/net/ethernet/dec/tulip/de4x5.c:3908:11-17: Unneeded variable:
"status". Return "0" on line 3912
Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9a98f90
...@@ -951,7 +951,7 @@ static void reset_init_sia(struct net_device *dev, s32 sicr, s32 strr, s32 si ...@@ -951,7 +951,7 @@ static void reset_init_sia(struct net_device *dev, s32 sicr, s32 strr, s32 si
static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec); static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec);
static int test_tp(struct net_device *dev, s32 msec); static int test_tp(struct net_device *dev, s32 msec);
static int EISA_signature(char *name, struct device *device); static int EISA_signature(char *name, struct device *device);
static int PCI_signature(char *name, struct de4x5_private *lp); static void PCI_signature(char *name, struct de4x5_private *lp);
static void DevicePresent(struct net_device *dev, u_long iobase); static void DevicePresent(struct net_device *dev, u_long iobase);
static void enet_addr_rst(u_long aprom_addr); static void enet_addr_rst(u_long aprom_addr);
static int de4x5_bad_srom(struct de4x5_private *lp); static int de4x5_bad_srom(struct de4x5_private *lp);
...@@ -3902,14 +3902,14 @@ EISA_signature(char *name, struct device *device) ...@@ -3902,14 +3902,14 @@ EISA_signature(char *name, struct device *device)
/* /*
** Look for a particular board name in the PCI configuration space ** Look for a particular board name in the PCI configuration space
*/ */
static int static void
PCI_signature(char *name, struct de4x5_private *lp) PCI_signature(char *name, struct de4x5_private *lp)
{ {
int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures); int i, siglen = ARRAY_SIZE(de4x5_signatures);
if (lp->chipset == DC21040) { if (lp->chipset == DC21040) {
strcpy(name, "DE434/5"); strcpy(name, "DE434/5");
return status; return;
} else { /* Search for a DEC name in the SROM */ } else { /* Search for a DEC name in the SROM */
int tmp = *((char *)&lp->srom + 19) * 3; int tmp = *((char *)&lp->srom + 19) * 3;
strncpy(name, (char *)&lp->srom + 26 + tmp, 8); strncpy(name, (char *)&lp->srom + 26 + tmp, 8);
...@@ -3935,8 +3935,6 @@ PCI_signature(char *name, struct de4x5_private *lp) ...@@ -3935,8 +3935,6 @@ PCI_signature(char *name, struct de4x5_private *lp)
} else if ((lp->chipset & ~0x00ff) == DC2114x) { } else if ((lp->chipset & ~0x00ff) == DC2114x) {
lp->useSROM = true; lp->useSROM = true;
} }
return status;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment