openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ne: Misc fixes for platform driver. 

Miscellaneous fixes to make ne platform driver work properly.

* Make ioaddr 'unsigned long'.
* Move a printk down to show dev->name assigned in register_netdev.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Atsushi Nemoto 2007-05-01 00:27:39 +09:00 committed by Jeff Garzik
parent a4d542b9fc
commit f0e93c10fa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ne.c
View File

@ -147,7 +147,7 @@ bad_clone_list[] __initdata = {
# define DCR_VAL 0x49 # define DCR_VAL 0x49
#endif #endif
static int ne_probe1(struct net_device *dev, int ioaddr); static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
static int ne_probe_isapnp(struct net_device *dev); static int ne_probe_isapnp(struct net_device *dev);
static int ne_open(struct net_device *dev); static int ne_open(struct net_device *dev);
@ -185,7 +185,7 @@ static void ne_block_output(struct net_device *dev, const int count,
static int __init do_ne_probe(struct net_device *dev) static int __init do_ne_probe(struct net_device *dev)
{ {
unsigned int base_addr = dev->base_addr; unsigned long base_addr = dev->base_addr;
#ifndef MODULE #ifndef MODULE
int orig_irq = dev->irq; int orig_irq = dev->irq;
#endif #endif
@ -286,7 +286,7 @@ static int __init ne_probe_isapnp(struct net_device *dev)
return -ENODEV; return -ENODEV;
} }
static int __init ne_probe1(struct net_device *dev, int ioaddr) static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
{ {
int i; int i;
unsigned char SA_prom[32]; unsigned char SA_prom[32];
@ -325,7 +325,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
if (ei_debug && version_printed++ == 0) if (ei_debug && version_printed++ == 0)
printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2); printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2);
printk(KERN_INFO "NE*000 ethercard probe at %#3x:", ioaddr); printk(KERN_INFO "NE*000 ethercard probe at %#3lx:", ioaddr);
/* A user with a poor card that fails to ack the reset, or that /* A user with a poor card that fails to ack the reset, or that
does not have a valid 0x57,0x57 signature can still use this does not have a valid 0x57,0x57 signature can still use this
@ -517,8 +517,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
} }
#endif #endif
printk("\n%s: %s found at %#x, using IRQ %d.\n", printk("\n");
dev->name, name, ioaddr, dev->irq);
ei_status.name = name; ei_status.name = name;
ei_status.tx_start_page = start_page; ei_status.tx_start_page = start_page;
@ -548,6 +547,8 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret) if (ret)
goto out_irq; goto out_irq;
printk(KERN_INFO "%s: %s found at %#lx, using IRQ %d.\n",
dev->name, name, ioaddr, dev->irq);
return 0; return 0;
out_irq: out_irq: