joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-29 07:01:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Al Viro 2006-10-10 00:19:36 +01:00 committed by Jeff Garzik
parent b936889c8f
commit 3470cb1d4f
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/8390.h
View File

@ -107,10 +107,6 @@ struct ei_device {
* - removed AMIGA_PCMCIA from this list, handled as ISA io now * - removed AMIGA_PCMCIA from this list, handled as ISA io now
*/ */
#if defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
#define EI_SHIFT(x) (ei_local->reg_offset[x])
#endif
#ifndef ei_inb #ifndef ei_inb
#define ei_inb(_p) inb(_p) #define ei_inb(_p) inb(_p)
#define ei_outb(_v,_p) outb(_v,_p) #define ei_outb(_v,_p) outb(_v,_p)

2
drivers/net/Makefile
View File

@ -106,7 +106,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o
obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_B44) += b44.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o obj-$(CONFIG_FORCEDETH) += forcedeth.o
obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o obj-$(CONFIG_NE_H8300) += ne-h8300.o
obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
obj-$(CONFIG_QLA3XXX) += qla3xxx.o obj-$(CONFIG_QLA3XXX) += qla3xxx.o

23
drivers/net/ne-h8300.c
View File

@ -33,6 +33,8 @@ static const char version1[] =
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#define EI_SHIFT(x) (ei_local->reg_offset[x])
#include "8390.h" #include "8390.h"
#define DRV_NAME "ne-h8300" #define DRV_NAME "ne-h8300"
@ -52,6 +54,11 @@ static const char version1[] =
/* ---- No user-serviceable parts below ---- */ /* ---- No user-serviceable parts below ---- */
static const char version[] =
"8390.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
#include "lib8390.c"
#define NE_BASE (dev->base_addr) #define NE_BASE (dev->base_addr)
#define NE_CMD 0x00 #define NE_CMD 0x00
#define NE_DATAPORT (ei_status.word16?0x20:0x10) /* NatSemi-defined port window offset. */ #define NE_DATAPORT (ei_status.word16?0x20:0x10) /* NatSemi-defined port window offset. */
@ -162,7 +169,7 @@ static void cleanup_card(struct net_device *dev)
#ifndef MODULE #ifndef MODULE
struct net_device * __init ne_probe(int unit) struct net_device * __init ne_probe(int unit)
{ {
struct net_device *dev = alloc_ei_netdev(); struct net_device *dev = ____alloc_ei_netdev(0);
int err; int err;
if (!dev) if (!dev)
@ -283,7 +290,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
/* Snarf the interrupt now. There's no point in waiting since we cannot /* Snarf the interrupt now. There's no point in waiting since we cannot
share and the board will usually be enabled. */ share and the board will usually be enabled. */
ret = request_irq(dev->irq, ei_interrupt, 0, name, dev); ret = request_irq(dev->irq, __ei_interrupt, 0, name, dev);
if (ret) { if (ret) {
printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret); printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret);
goto err_out; goto err_out;
@ -318,9 +325,9 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
dev->open = &ne_open; dev->open = &ne_open;
dev->stop = &ne_close; dev->stop = &ne_close;
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll; dev->poll_controller = __ei_poll;
#endif #endif
NS8390_init(dev, 0); __NS8390_init(dev, 0);
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret) if (ret)
@ -335,7 +342,7 @@ err_out:
static int ne_open(struct net_device *dev) static int ne_open(struct net_device *dev)
{ {
ei_open(dev); __ei_open(dev);
return 0; return 0;
} }
@ -343,7 +350,7 @@ static int ne_close(struct net_device *dev)
{ {
if (ei_debug > 1) if (ei_debug > 1)
printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
ei_close(dev); __ei_close(dev);
return 0; return 0;
} }
@ -584,7 +591,7 @@ retry:
if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */ if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */
printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name); printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
ne_reset_8390(dev); ne_reset_8390(dev);
NS8390_init(dev,1); __NS8390_init(dev,1);
break; break;
} }
@ -620,7 +627,7 @@ int init_module(void)
int err; int err;
for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
struct net_device *dev = alloc_ei_netdev(); struct net_device *dev = ____alloc_ei_netdev(0);
if (!dev) if (!dev)
break; break;
if (io[this_dev]) { if (io[this_dev]) {