diff options
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 9522baf8d997..75a64c88cf7a 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -1883,8 +1883,6 @@ de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len) | |||
1883 | if (lp->pktStats.bins[0] == 0) { /* Reset counters */ | 1883 | if (lp->pktStats.bins[0] == 0) { /* Reset counters */ |
1884 | memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats)); | 1884 | memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats)); |
1885 | } | 1885 | } |
1886 | |||
1887 | return; | ||
1888 | } | 1886 | } |
1889 | 1887 | ||
1890 | /* | 1888 | /* |
@@ -1991,8 +1989,6 @@ SetMulticastFilter(struct net_device *dev) | |||
1991 | } | 1989 | } |
1992 | } | 1990 | } |
1993 | outl(omr, DE4X5_OMR); | 1991 | outl(omr, DE4X5_OMR); |
1994 | |||
1995 | return; | ||
1996 | } | 1992 | } |
1997 | 1993 | ||
1998 | #ifdef CONFIG_EISA | 1994 | #ifdef CONFIG_EISA |
@@ -2187,8 +2183,6 @@ srom_search(struct net_device *dev, struct pci_dev *pdev) | |||
2187 | return; | 2183 | return; |
2188 | } | 2184 | } |
2189 | } | 2185 | } |
2190 | |||
2191 | return; | ||
2192 | } | 2186 | } |
2193 | 2187 | ||
2194 | /* | 2188 | /* |
@@ -3291,8 +3285,6 @@ de4x5_init_connection(struct net_device *dev) | |||
3291 | outl(POLL_DEMAND, DE4X5_TPD); | 3285 | outl(POLL_DEMAND, DE4X5_TPD); |
3292 | 3286 | ||
3293 | netif_wake_queue(dev); | 3287 | netif_wake_queue(dev); |
3294 | |||
3295 | return; | ||
3296 | } | 3288 | } |
3297 | 3289 | ||
3298 | /* | 3290 | /* |
@@ -3664,8 +3656,6 @@ de4x5_free_rx_buffs(struct net_device *dev) | |||
3664 | lp->rx_ring[i].status = 0; | 3656 | lp->rx_ring[i].status = 0; |
3665 | lp->rx_skb[i] = (struct sk_buff *)1; /* Dummy entry */ | 3657 | lp->rx_skb[i] = (struct sk_buff *)1; /* Dummy entry */ |
3666 | } | 3658 | } |
3667 | |||
3668 | return; | ||
3669 | } | 3659 | } |
3670 | 3660 | ||
3671 | static void | 3661 | static void |
@@ -3708,8 +3698,6 @@ de4x5_save_skbs(struct net_device *dev) | |||
3708 | lp->cache.save_cnt++; | 3698 | lp->cache.save_cnt++; |
3709 | START_DE4X5; | 3699 | START_DE4X5; |
3710 | } | 3700 | } |
3711 | |||
3712 | return; | ||
3713 | } | 3701 | } |
3714 | 3702 | ||
3715 | static void | 3703 | static void |
@@ -3741,8 +3729,6 @@ de4x5_rst_desc_ring(struct net_device *dev) | |||
3741 | lp->cache.save_cnt--; | 3729 | lp->cache.save_cnt--; |
3742 | START_DE4X5; | 3730 | START_DE4X5; |
3743 | } | 3731 | } |
3744 | |||
3745 | return; | ||
3746 | } | 3732 | } |
3747 | 3733 | ||
3748 | static void | 3734 | static void |
@@ -3771,8 +3757,6 @@ de4x5_cache_state(struct net_device *dev, int flag) | |||
3771 | } | 3757 | } |
3772 | break; | 3758 | break; |
3773 | } | 3759 | } |
3774 | |||
3775 | return; | ||
3776 | } | 3760 | } |
3777 | 3761 | ||
3778 | static void | 3762 | static void |
@@ -3845,8 +3829,6 @@ de4x5_setup_intr(struct net_device *dev) | |||
3845 | outl(sts, DE4X5_STS); | 3829 | outl(sts, DE4X5_STS); |
3846 | ENABLE_IRQs; | 3830 | ENABLE_IRQs; |
3847 | } | 3831 | } |
3848 | |||
3849 | return; | ||
3850 | } | 3832 | } |
3851 | 3833 | ||
3852 | /* | 3834 | /* |
@@ -3879,8 +3861,6 @@ reset_init_sia(struct net_device *dev, s32 csr13, s32 csr14, s32 csr15) | |||
3879 | outl(csr13, DE4X5_SICR); | 3861 | outl(csr13, DE4X5_SICR); |
3880 | 3862 | ||
3881 | mdelay(10); | 3863 | mdelay(10); |
3882 | |||
3883 | return; | ||
3884 | } | 3864 | } |
3885 | 3865 | ||
3886 | /* | 3866 | /* |
@@ -3901,8 +3881,6 @@ create_packet(struct net_device *dev, char *frame, int len) | |||
3901 | 3881 | ||
3902 | *buf++ = 0; /* Packet length (2 bytes) */ | 3882 | *buf++ = 0; /* Packet length (2 bytes) */ |
3903 | *buf++ = 1; | 3883 | *buf++ = 1; |
3904 | |||
3905 | return; | ||
3906 | } | 3884 | } |
3907 | 3885 | ||
3908 | /* | 3886 | /* |
@@ -4006,8 +3984,6 @@ DevicePresent(struct net_device *dev, u_long aprom_addr) | |||
4006 | } | 3984 | } |
4007 | de4x5_dbg_srom((struct de4x5_srom *)&lp->srom); | 3985 | de4x5_dbg_srom((struct de4x5_srom *)&lp->srom); |
4008 | } | 3986 | } |
4009 | |||
4010 | return; | ||
4011 | } | 3987 | } |
4012 | 3988 | ||
4013 | /* | 3989 | /* |
@@ -4045,8 +4021,6 @@ enet_addr_rst(u_long aprom_addr) | |||
4045 | } | 4021 | } |
4046 | } | 4022 | } |
4047 | } | 4023 | } |
4048 | |||
4049 | return; | ||
4050 | } | 4024 | } |
4051 | 4025 | ||
4052 | /* | 4026 | /* |
@@ -4186,8 +4160,6 @@ srom_repair(struct net_device *dev, int card) | |||
4186 | lp->useSROM = true; | 4160 | lp->useSROM = true; |
4187 | break; | 4161 | break; |
4188 | } | 4162 | } |
4189 | |||
4190 | return; | ||
4191 | } | 4163 | } |
4192 | 4164 | ||
4193 | /* | 4165 | /* |
@@ -4261,8 +4233,6 @@ srom_latch(u_int command, u_long addr) | |||
4261 | sendto_srom(command, addr); | 4233 | sendto_srom(command, addr); |
4262 | sendto_srom(command | DT_CLK, addr); | 4234 | sendto_srom(command | DT_CLK, addr); |
4263 | sendto_srom(command, addr); | 4235 | sendto_srom(command, addr); |
4264 | |||
4265 | return; | ||
4266 | } | 4236 | } |
4267 | 4237 | ||
4268 | static void | 4238 | static void |
@@ -4271,8 +4241,6 @@ srom_command(u_int command, u_long addr) | |||
4271 | srom_latch(command, addr); | 4241 | srom_latch(command, addr); |
4272 | srom_latch(command, addr); | 4242 | srom_latch(command, addr); |
4273 | srom_latch((command & 0x0000ff00) | DT_CS, addr); | 4243 | srom_latch((command & 0x0000ff00) | DT_CS, addr); |
4274 | |||
4275 | return; | ||
4276 | } | 4244 | } |
4277 | 4245 | ||
4278 | static void | 4246 | static void |
@@ -4287,8 +4255,6 @@ srom_address(u_int command, u_long addr, u_char offset) | |||
4287 | udelay(1); | 4255 | udelay(1); |
4288 | 4256 | ||
4289 | i = (getfrom_srom(addr) >> 3) & 0x01; | 4257 | i = (getfrom_srom(addr) >> 3) & 0x01; |
4290 | |||
4291 | return; | ||
4292 | } | 4258 | } |
4293 | 4259 | ||
4294 | static short | 4260 | static short |
@@ -4322,8 +4288,6 @@ srom_busy(u_int command, u_long addr) | |||
4322 | } | 4288 | } |
4323 | 4289 | ||
4324 | sendto_srom(command & 0x0000ff00, addr); | 4290 | sendto_srom(command & 0x0000ff00, addr); |
4325 | |||
4326 | return; | ||
4327 | } | 4291 | } |
4328 | */ | 4292 | */ |
4329 | 4293 | ||
@@ -4332,8 +4296,6 @@ sendto_srom(u_int command, u_long addr) | |||
4332 | { | 4296 | { |
4333 | outl(command, addr); | 4297 | outl(command, addr); |
4334 | udelay(1); | 4298 | udelay(1); |
4335 | |||
4336 | return; | ||
4337 | } | 4299 | } |
4338 | 4300 | ||
4339 | static int | 4301 | static int |
@@ -4432,8 +4394,6 @@ srom_init(struct net_device *dev) | |||
4432 | p += ((*p & BLOCK_LEN) + 1); | 4394 | p += ((*p & BLOCK_LEN) + 1); |
4433 | } | 4395 | } |
4434 | } | 4396 | } |
4435 | |||
4436 | return; | ||
4437 | } | 4397 | } |
4438 | 4398 | ||
4439 | /* | 4399 | /* |
@@ -4462,8 +4422,6 @@ srom_exec(struct net_device *dev, u_char *p) | |||
4462 | outl(lp->cache.csr14, DE4X5_STRR); | 4422 | outl(lp->cache.csr14, DE4X5_STRR); |
4463 | outl(lp->cache.csr13, DE4X5_SICR); | 4423 | outl(lp->cache.csr13, DE4X5_SICR); |
4464 | } | 4424 | } |
4465 | |||
4466 | return; | ||
4467 | } | 4425 | } |
4468 | 4426 | ||
4469 | /* | 4427 | /* |
@@ -4888,8 +4846,6 @@ mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr) | |||
4888 | mii_ta(MII_STWR, ioaddr); /* Turn around time - 2 MDC */ | 4846 | mii_ta(MII_STWR, ioaddr); /* Turn around time - 2 MDC */ |
4889 | data = mii_swap(data, 16); /* Swap data bit ordering */ | 4847 | data = mii_swap(data, 16); /* Swap data bit ordering */ |
4890 | mii_wdata(data, 16, ioaddr); /* Write data */ | 4848 | mii_wdata(data, 16, ioaddr); /* Write data */ |
4891 | |||
4892 | return; | ||
4893 | } | 4849 | } |
4894 | 4850 | ||
4895 | static int | 4851 | static int |
@@ -4915,8 +4871,6 @@ mii_wdata(int data, int len, u_long ioaddr) | |||
4915 | sendto_mii(MII_MWR | MII_WR, data, ioaddr); | 4871 | sendto_mii(MII_MWR | MII_WR, data, ioaddr); |
4916 | data >>= 1; | 4872 | data >>= 1; |
4917 | } | 4873 | } |
4918 | |||
4919 | return; | ||
4920 | } | 4874 | } |
4921 | 4875 | ||
4922 | static void | 4876 | static void |
@@ -4929,8 +4883,6 @@ mii_address(u_char addr, u_long ioaddr) | |||
4929 | sendto_mii(MII_MWR | MII_WR, addr, ioaddr); | 4883 | sendto_mii(MII_MWR | MII_WR, addr, ioaddr); |
4930 | addr >>= 1; | 4884 | addr >>= 1; |
4931 | } | 4885 | } |
4932 | |||
4933 | return; | ||
4934 | } | 4886 | } |
4935 | 4887 | ||
4936 | static void | 4888 | static void |
@@ -4942,8 +4894,6 @@ mii_ta(u_long rw, u_long ioaddr) | |||
4942 | } else { | 4894 | } else { |
4943 | getfrom_mii(MII_MRD | MII_RD, ioaddr); /* Tri-state MDIO */ | 4895 | getfrom_mii(MII_MRD | MII_RD, ioaddr); /* Tri-state MDIO */ |
4944 | } | 4896 | } |
4945 | |||
4946 | return; | ||
4947 | } | 4897 | } |
4948 | 4898 | ||
4949 | static int | 4899 | static int |
@@ -4970,8 +4920,6 @@ sendto_mii(u32 command, int data, u_long ioaddr) | |||
4970 | udelay(1); | 4920 | udelay(1); |
4971 | outl(command | MII_MDC | j, ioaddr); | 4921 | outl(command | MII_MDC | j, ioaddr); |
4972 | udelay(1); | 4922 | udelay(1); |
4973 | |||
4974 | return; | ||
4975 | } | 4923 | } |
4976 | 4924 | ||
4977 | static int | 4925 | static int |
@@ -5185,8 +5133,6 @@ gep_wr(s32 data, struct net_device *dev) | |||
5185 | } else if ((lp->chipset & ~0x00ff) == DC2114x) { | 5133 | } else if ((lp->chipset & ~0x00ff) == DC2114x) { |
5186 | outl((data<<16) | lp->cache.csr15, DE4X5_SIGR); | 5134 | outl((data<<16) | lp->cache.csr15, DE4X5_SIGR); |
5187 | } | 5135 | } |
5188 | |||
5189 | return; | ||
5190 | } | 5136 | } |
5191 | 5137 | ||
5192 | static int | 5138 | static int |
@@ -5246,8 +5192,6 @@ yawn(struct net_device *dev, int state) | |||
5246 | break; | 5192 | break; |
5247 | } | 5193 | } |
5248 | } | 5194 | } |
5249 | |||
5250 | return; | ||
5251 | } | 5195 | } |
5252 | 5196 | ||
5253 | static void | 5197 | static void |
@@ -5289,8 +5233,6 @@ de4x5_parse_params(struct net_device *dev) | |||
5289 | } | 5233 | } |
5290 | *q = t; | 5234 | *q = t; |
5291 | } | 5235 | } |
5292 | |||
5293 | return; | ||
5294 | } | 5236 | } |
5295 | 5237 | ||
5296 | static void | 5238 | static void |
@@ -5340,8 +5282,6 @@ de4x5_dbg_open(struct net_device *dev) | |||
5340 | (short)lp->rxRingSize, | 5282 | (short)lp->rxRingSize, |
5341 | (short)lp->txRingSize); | 5283 | (short)lp->txRingSize); |
5342 | } | 5284 | } |
5343 | |||
5344 | return; | ||
5345 | } | 5285 | } |
5346 | 5286 | ||
5347 | static void | 5287 | static void |
@@ -5368,8 +5308,6 @@ de4x5_dbg_mii(struct net_device *dev, int k) | |||
5368 | printk("MII 20: %x\n",mii_rd(0x14,lp->phy[k].addr,DE4X5_MII)); | 5308 | printk("MII 20: %x\n",mii_rd(0x14,lp->phy[k].addr,DE4X5_MII)); |
5369 | } | 5309 | } |
5370 | } | 5310 | } |
5371 | |||
5372 | return; | ||
5373 | } | 5311 | } |
5374 | 5312 | ||
5375 | static void | 5313 | static void |
@@ -5394,8 +5332,6 @@ de4x5_dbg_media(struct net_device *dev) | |||
5394 | } | 5332 | } |
5395 | lp->c_media = lp->media; | 5333 | lp->c_media = lp->media; |
5396 | } | 5334 | } |
5397 | |||
5398 | return; | ||
5399 | } | 5335 | } |
5400 | 5336 | ||
5401 | static void | 5337 | static void |
@@ -5416,8 +5352,6 @@ de4x5_dbg_srom(struct de4x5_srom *p) | |||
5416 | printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i)); | 5352 | printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i)); |
5417 | } | 5353 | } |
5418 | } | 5354 | } |
5419 | |||
5420 | return; | ||
5421 | } | 5355 | } |
5422 | 5356 | ||
5423 | static void | 5357 | static void |
@@ -5439,8 +5373,6 @@ de4x5_dbg_rx(struct sk_buff *skb, int len) | |||
5439 | printk("\n"); | 5373 | printk("\n"); |
5440 | } | 5374 | } |
5441 | } | 5375 | } |
5442 | |||
5443 | return; | ||
5444 | } | 5376 | } |
5445 | 5377 | ||
5446 | /* | 5378 | /* |