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

Commit aa00d40b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '8390-cleanups' 



Finn Thain says:

====================
Fixes, cleanup and modernization for 8390 ethernet drivers

Changes since v4 of combined patch series:
- Removed redundant and non-portable MACH_IS_MAC tests.
- Added acked-by tags from Geert Uytterhoeven.
- Omitted patches unrelated to 8390 drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4be83e5a 4a1b27c9

drivers/net/Space.c

+0 −3
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ static struct devprobe2 m68k_probes[] __initdata = { 
#ifdef CONFIG_MVME147_NET	/* MVME147 internal Ethernet */

	{mvme147lance_probe, 0},

#endif

#ifdef CONFIG_MAC8390           /* NuBus NS8390-based cards */

	{mac8390_probe, 0},

#endif

#ifdef CONFIG_MAC89x0

	{mac89x0_probe, 0},

#endif

drivers/net/ethernet/8390/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ obj-$(CONFIG_MAC8390) += mac8390.o 
obj-$(CONFIG_APNE) += apne.o 8390.o

obj-$(CONFIG_ARM_ETHERH) += etherh.o

obj-$(CONFIG_AX88796) += ax88796.o

obj-$(CONFIG_HYDRA) += hydra.o 8390.o

obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o

obj-$(CONFIG_HYDRA) += hydra.o

obj-$(CONFIG_MCF8390) += mcf8390.o

obj-$(CONFIG_NE2000) += ne.o 8390p.o

obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o

obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o 8390.o
@@ -16,4 +16,4 @@ obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o 
obj-$(CONFIG_STNIC) += stnic.o 8390.o

obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o

obj-$(CONFIG_WD80x3) += wd.o 8390.o

obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
 
obj-$(CONFIG_ZORRO8390) += zorro8390.o

drivers/net/ethernet/8390/ax88796.c

+0 −3
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ static unsigned char version[] = "ax88796.c: Copyright 2005,2007 Simtec Electron 


#define AX_GPOC_PPDSET	BIT(6)



static u32 ax_msg_enable;



/* device private data */



struct ax_device {
@@ -747,7 +745,6 @@ static int ax_init_dev(struct net_device *dev) 
	ei_local->block_output = &ax_block_output;

	ei_local->get_8390_hdr = &ax_get_8390_hdr;

	ei_local->priv = 0;

	ei_local->msg_enable = ax_msg_enable;



	dev->netdev_ops = &ax_netdev_ops;

	dev->ethtool_ops = &ax_ethtool_ops;

drivers/net/ethernet/8390/axnet_cs.c

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static void AX88190_init(struct net_device *dev, int startp); 
static int ax_open(struct net_device *dev);

static int ax_close(struct net_device *dev);

static irqreturn_t ax_interrupt(int irq, void *dev_id);

static u32 axnet_msg_enable;



/*====================================================================*/
@@ -151,7 +150,6 @@ static int axnet_probe(struct pcmcia_device *link) 
	return -ENOMEM;



    ei_local = netdev_priv(dev);

    ei_local->msg_enable = axnet_msg_enable;

    spin_lock_init(&ei_local->page_lock);



    info = PRIV(dev);

drivers/net/ethernet/8390/etherh.c

+0 −17
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ static char version[] = 


#include "lib8390.c"



static u32 etherh_msg_enable;



struct etherh_priv {

	void __iomem	*ioc_fast;

	void __iomem	*memc;
@@ -501,18 +499,6 @@ etherh_close(struct net_device *dev) 
	return 0;

}



/*

 * Initialisation

 */



static void __init etherh_banner(void)

{

	static int version_printed;



	if ((etherh_msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0))

		pr_info("%s", version);

}



/*

 * Read the ethernet address string from the on board rom.

 * This is an ascii string...
@@ -671,8 +657,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id) 
	struct etherh_priv *eh;

	int ret;



	etherh_banner();



	ret = ecard_request_resources(ec);

	if (ret)

		goto out;
@@ -757,7 +741,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id) 
	ei_local->block_output  = etherh_block_output;

	ei_local->get_8390_hdr  = etherh_get_header;

	ei_local->interface_num = 0;

	ei_local->msg_enable = etherh_msg_enable;



	etherh_reset(dev);

	__NS8390_init(dev, 0);