The patch titled
ne: misc fixes for platform driver
has been added to the -mm tree. Its filename is
ne-misc-fixes-for-platform-driver.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ne: misc fixes for platform driver
From: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/ne.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -puN drivers/net/ne.c~ne-misc-fixes-for-platform-driver drivers/net/ne.c
--- a/drivers/net/ne.c~ne-misc-fixes-for-platform-driver
+++ a/drivers/net/ne.c
@@ -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_d
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
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_d
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_d
}
#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_d
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:
_
Patches currently in -mm which might be from anemo@xxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
git-mips.patch
mips-drop-unnecessary-config_isa-from-rbtx49xx.patch
ne-add-platform_driver.patch
ne-misc-fixes-for-platform-driver.patch
ne-add-needs_portlist-to-control-isa-auto-probe.patch
ne-mips-use-platform_driver-for-ne-on-rbtx49xx.patch
serial_txx9-use-assigned-device-numbers.patch
serial_txx9-zap-changelog-from-source-code.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
