Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0e93c10 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Jeff Garzik
Browse files

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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a4d542b9

drivers/net/ne.c

+7 −6
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ bad_clone_list[] __initdata = { 
#  define DCR_VAL 0x49

#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_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)

{

	unsigned int base_addr = dev->base_addr;

	unsigned long base_addr = dev->base_addr;

#ifndef MODULE

	int orig_irq = dev->irq;

#endif
@@ -286,7 +286,7 @@ static int __init ne_probe_isapnp(struct net_device *dev) 
	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;

	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)

		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

	   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



	printk("\n%s: %s found at %#x, using IRQ %d.\n",

		dev->name, name, ioaddr, dev->irq);

	printk("\n");



	ei_status.name = name;

	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);

	if (ret)

		goto out_irq;

	printk(KERN_INFO "%s: %s found at %#lx, using IRQ %d.\n",

	       dev->name, name, ioaddr, dev->irq);

	return 0;



out_irq: