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

Commit d181a617 authored by Domenico Andreoli's avatar Domenico Andreoli Committed by David S. Miller
Browse files

CS89x0: Finish transition to CS89x0_NONISA_IRQ 



CS89x0_NONISA_IRQ is selected by all those non-ISA boards which use
CS89x0. This patch only cleans the last bits left after its introduction.

Signed-off-by: default avatarDomenico Andreoli <cavokz@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c05e7ac9

drivers/net/cs89x0.c

+4 −4
Original line number Diff line number Diff line
@@ -943,10 +943,10 @@ dma_rx(struct net_device *dev) 
static void __init reset_chip(struct net_device *dev)

{

#if !defined(CONFIG_MACH_MX31ADS)

#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)

#if !defined(CS89x0_NONISA_IRQ)

	struct net_local *lp = netdev_priv(dev);

	int ioaddr = dev->base_addr;

#endif

#endif /* CS89x0_NONISA_IRQ */

	int reset_start_time;



	writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
@@ -954,7 +954,7 @@ static void __init reset_chip(struct net_device *dev) 
	/* wait 30 ms */

	msleep(30);



#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)

#if !defined(CS89x0_NONISA_IRQ)

	if (lp->chip_type != CS8900) {

		/* Hardware problem requires PNP registers to be reconfigured after a reset */

		writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT);
@@ -965,7 +965,7 @@ static void __init reset_chip(struct net_device *dev) 
		outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT);

		outb((dev->mem_start >> 8) & 0xff,   ioaddr + DATA_PORT + 1);

	}

#endif	/* IXDP2x01 */

#endif /* CS89x0_NONISA_IRQ */



	/* Wait until the chip is reset */

	reset_start_time = jiffies;