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

Commit 8eb97ff5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

net: 8390: remove m32r specific bits 



The m32r architecture is getting removed, so we can kill off the
architecture specific hacks in this driver.

Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 768a032d

drivers/net/ethernet/8390/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -87,8 +87,7 @@ config MCF8390 




config NE2000

config NE2000

	tristate "NE2000/NE1000 support"

	tristate "NE2000/NE1000 support"

	depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \

	depends on (ISA || (Q40 && m) || MACH_TX49XX || ATARI_ETHERNEC)

		    ATARI_ETHERNEC)

	select CRC32

	select CRC32

	---help---

	---help---

	  If you have a network (Ethernet) card of this type, say Y here.

	  If you have a network (Ethernet) card of this type, say Y here.

drivers/net/ethernet/8390/ne.c

+2 −21
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ MODULE_LICENSE("GPL"); 
that the ne2k probe is the last 8390 based probe to take place (as it

that the ne2k probe is the last 8390 based probe to take place (as it

is at boot) and so the probe will get confused by any other 8390 cards.

is at boot) and so the probe will get confused by any other 8390 cards.

ISA device autoprobes on a running machine are not recommended anyway. */

ISA device autoprobes on a running machine are not recommended anyway. */

#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R))

#if !defined(MODULE) && defined(CONFIG_ISA)

/* Do we need a portlist for the ISA auto-probe ? */

/* Do we need a portlist for the ISA auto-probe ? */

#define NEEDS_PORTLIST

#define NEEDS_PORTLIST

#endif

#endif
@@ -164,12 +164,7 @@ bad_clone_list[] __initdata = { 
#define NESM_START_PG	0x40	/* First page of TX buffer */

#define NESM_START_PG	0x40	/* First page of TX buffer */

#define NESM_STOP_PG	0x80	/* Last page +1 of RX ring */

#define NESM_STOP_PG	0x80	/* Last page +1 of RX ring */





#if defined(CONFIG_PLAT_MAPPI)

#if defined(CONFIG_ATARI)	/* 8-bit mode on Atari, normal on Q40 */

#  define DCR_VAL 0x4b

#elif defined(CONFIG_PLAT_OAKS32R)  || \

   defined(CONFIG_MACH_TX49XX)

#  define DCR_VAL 0x48		/* 8-bit mode */

#elif defined(CONFIG_ATARI)	/* 8-bit mode on Atari, normal on Q40 */

#  define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49)

#  define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49)

#else

#else

#  define DCR_VAL 0x49

#  define DCR_VAL 0x49
@@ -422,12 +417,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) 
		stop_page  = NE1SM_STOP_PG;

		stop_page  = NE1SM_STOP_PG;

	}

	}





#if  defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R)

	neX000 = ((SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57)

		|| (SA_prom[14] == 0x42 && SA_prom[15] == 0x42));

#else

	neX000 = (SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57);

	neX000 = (SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57);

#endif

	ctron =  (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d);

	ctron =  (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d);

	copam =  (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);

	copam =  (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);
@@ -508,18 +498,9 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) 




	dev->base_addr = ioaddr;

	dev->base_addr = ioaddr;





#ifdef CONFIG_PLAT_MAPPI

	outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP,

		ioaddr + E8390_CMD); /* 0x61 */

	for (i = 0; i < ETH_ALEN; i++) {

		dev->dev_addr[i] = SA_prom[i]

			= inb_p(ioaddr + EN1_PHYS_SHIFT(i));

	}

#else

	for (i = 0; i < ETH_ALEN; i++) {

	for (i = 0; i < ETH_ALEN; i++) {

		dev->dev_addr[i] = SA_prom[i];

		dev->dev_addr[i] = SA_prom[i];

	}

	}

#endif





	pr_cont("%pM\n", dev->dev_addr);

	pr_cont("%pM\n", dev->dev_addr);