Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 3470cb1d4fb27572273079e7095734ac4f9caa43

Authored by Al Viro
Committed by Jeff Garzik
1 parent b936889c8f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] 8390 fixes - the final chunk (h8300) 

The rest of 8390 conversions; ifdef cascade in 8390.h is gone now.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

Showing 3 changed files with 16 additions and 13 deletions Side-by-side Diff

... ... @@ -107,10 +107,6 @@
107 107 * - removed AMIGA_PCMCIA from this list, handled as ISA io now
108 108 */
109 109  
110   -#if defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
111   -#define EI_SHIFT(x) (ei_local->reg_offset[x])
112   -#endif
113   -
114 110 #ifndef ei_inb
115 111 #define ei_inb(_p) inb(_p)
116 112 #define ei_outb(_v,_p) outb(_v,_p)
drivers/net/Makefile
Diff comments   View file @ 3470cb1
... ... @@ -106,7 +106,7 @@
106 106 obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
107 107 obj-$(CONFIG_B44) += b44.o
108 108 obj-$(CONFIG_FORCEDETH) += forcedeth.o
109   -obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
  109 +obj-$(CONFIG_NE_H8300) += ne-h8300.o
110 110  
111 111 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
112 112 obj-$(CONFIG_QLA3XXX) += qla3xxx.o
drivers/net/ne-h8300.c
Diff comments   View file @ 3470cb1
... ... @@ -33,6 +33,8 @@
33 33 #include <asm/io.h>
34 34 #include <asm/irq.h>
35 35  
  36 +#define EI_SHIFT(x) (ei_local->reg_offset[x])
  37 +
36 38 #include "8390.h"
37 39  
38 40 #define DRV_NAME "ne-h8300"
... ... @@ -52,6 +54,11 @@
52 54  
53 55 /* ---- No user-serviceable parts below ---- */
54 56  
  57 +static const char version[] =
  58 + "8390.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
  59 +
  60 +#include "lib8390.c"
  61 +
55 62 #define NE_BASE (dev->base_addr)
56 63 #define NE_CMD 0x00
57 64 #define NE_DATAPORT (ei_status.word16?0x20:0x10) /* NatSemi-defined port window offset. */
... ... @@ -162,7 +169,7 @@
162 169 #ifndef MODULE
163 170 struct net_device * __init ne_probe(int unit)
164 171 {
165   - struct net_device *dev = alloc_ei_netdev();
  172 + struct net_device *dev = ____alloc_ei_netdev(0);
166 173 int err;
167 174  
168 175 if (!dev)
... ... @@ -283,7 +290,7 @@
283 290  
284 291 /* Snarf the interrupt now. There's no point in waiting since we cannot
285 292 share and the board will usually be enabled. */
286   - ret = request_irq(dev->irq, ei_interrupt, 0, name, dev);
  293 + ret = request_irq(dev->irq, __ei_interrupt, 0, name, dev);
287 294 if (ret) {
288 295 printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret);
289 296 goto err_out;
290 297  
... ... @@ -318,9 +325,9 @@
318 325 dev->open = &ne_open;
319 326 dev->stop = &ne_close;
320 327 #ifdef CONFIG_NET_POLL_CONTROLLER
321   - dev->poll_controller = ei_poll;
  328 + dev->poll_controller = __ei_poll;
322 329 #endif
323   - NS8390_init(dev, 0);
  330 + __NS8390_init(dev, 0);
324 331  
325 332 ret = register_netdev(dev);
326 333 if (ret)
... ... @@ -335,7 +342,7 @@
335 342  
336 343 static int ne_open(struct net_device *dev)
337 344 {
338   - ei_open(dev);
  345 + __ei_open(dev);
339 346 return 0;
340 347 }
341 348  
... ... @@ -343,7 +350,7 @@
343 350 {
344 351 if (ei_debug > 1)
345 352 printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
346   - ei_close(dev);
  353 + __ei_close(dev);
347 354 return 0;
348 355 }
349 356  
... ... @@ -584,7 +591,7 @@
584 591 if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */
585 592 printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
586 593 ne_reset_8390(dev);
587   - NS8390_init(dev,1);
  594 + __NS8390_init(dev,1);
588 595 break;
589 596 }
590 597  
... ... @@ -620,7 +627,7 @@
620 627 int err;
621 628  
622 629 for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
623   - struct net_device *dev = alloc_ei_netdev();
  630 + struct net_device *dev = ____alloc_ei_netdev(0);
624 631 if (!dev)
625 632 break;
626 633 if (io[this_dev]) {