hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/net/ethernet/dec/tulip/de4x5.c
....@@ -951,7 +951,7 @@
951951 static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec);
952952 static int test_tp(struct net_device *dev, s32 msec);
953953 static int EISA_signature(char *name, struct device *device);
954
-static int PCI_signature(char *name, struct de4x5_private *lp);
954
+static void PCI_signature(char *name, struct de4x5_private *lp);
955955 static void DevicePresent(struct net_device *dev, u_long iobase);
956956 static void enet_addr_rst(u_long aprom_addr);
957957 static int de4x5_bad_srom(struct de4x5_private *lp);
....@@ -3203,7 +3203,7 @@
32033203 case SROM_10BASETF:
32043204 if (!lp->params.fdx) return -1;
32053205 lp->fdx = true;
3206
- /* fall through */
3206
+ fallthrough;
32073207
32083208 case SROM_10BASET:
32093209 if (lp->params.fdx && !lp->fdx) return -1;
....@@ -3225,7 +3225,7 @@
32253225 case SROM_100BASETF:
32263226 if (!lp->params.fdx) return -1;
32273227 lp->fdx = true;
3228
- /* fall through */
3228
+ fallthrough;
32293229
32303230 case SROM_100BASET:
32313231 if (lp->params.fdx && !lp->fdx) return -1;
....@@ -3239,7 +3239,7 @@
32393239 case SROM_100BASEFF:
32403240 if (!lp->params.fdx) return -1;
32413241 lp->fdx = true;
3242
- /* fall through */
3242
+ fallthrough;
32433243
32443244 case SROM_100BASEF:
32453245 if (lp->params.fdx && !lp->fdx) return -1;
....@@ -3902,14 +3902,14 @@
39023902 /*
39033903 ** Look for a particular board name in the PCI configuration space
39043904 */
3905
-static int
3905
+static void
39063906 PCI_signature(char *name, struct de4x5_private *lp)
39073907 {
3908
- int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures);
3908
+ int i, siglen = ARRAY_SIZE(de4x5_signatures);
39093909
39103910 if (lp->chipset == DC21040) {
39113911 strcpy(name, "DE434/5");
3912
- return status;
3912
+ return;
39133913 } else { /* Search for a DEC name in the SROM */
39143914 int tmp = *((char *)&lp->srom + 19) * 3;
39153915 strncpy(name, (char *)&lp->srom + 26 + tmp, 8);
....@@ -3935,8 +3935,6 @@
39353935 } else if ((lp->chipset & ~0x00ff) == DC2114x) {
39363936 lp->useSROM = true;
39373937 }
3938
-
3939
- return status;
39403938 }
39413939
39423940 /*