[PATCH 07/11] Removing dead ARCH_PNX010X

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Christoph Egger
Date: Wednesday, July 14, 2010 - 5:41 am

ARCH_PNX010X doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
 drivers/net/cs89x0.c |   45 ---------------------------------------------
 1 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 2ccb9f1..7a5d787 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -180,12 +180,6 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
 #elif defined(CONFIG_ARCH_IXDP2X01)
 static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
-#elif defined(CONFIG_ARCH_PNX010X)
-#include <mach/gpio.h>
-#define CIRRUS_DEFAULT_BASE	IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)	/* = Physical address 0x48200000 */
-#define CIRRUS_DEFAULT_IRQ	VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
-static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
-static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
 #elif defined(CONFIG_MACH_MX31ADS)
 #include <mach/board-mx31ads.h>
 static unsigned int netcard_portlist[] __used __initdata = {
@@ -372,18 +366,6 @@ writeword(unsigned long base_addr, int portno, u16 value)
 {
 	__raw_writel(value, base_addr + (portno << 1));
 }
-#elif defined(CONFIG_ARCH_PNX010X)
-static u16
-readword(unsigned long base_addr, int portno)
-{
-	return inw(base_addr + (portno << 1));
-}
-
-static void
-writeword(unsigned long base_addr, int portno, u16 value)
-{
-	outw(value, base_addr + (portno << 1));
-}
 #else
 static u16
 readword(unsigned long base_addr, int portno)
@@ -546,30 +528,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
 #endif
         }
 
-#ifdef CONFIG_ARCH_PNX010X
-	initialize_ebi();
-
-	/* Map GPIO registers for the pins connected to the CS8900a. */
-	if (map_cirrus_gpio() < 0)
-		return -ENODEV;
-
-	reset_cirrus();
-
-	/* Map event-router registers. */
-	if (map_event_router() < 0)
-		return -ENODEV;
-
-	enable_cirrus_irq();
-
-	unmap_cirrus_gpio();
-	unmap_event_router();
-
-	dev->base_addr = ioaddr;
-
-	for (i = 0 ; i < 3 ; i++)
-		readreg(dev, 0);
-#endif
-
 	/* Grab the region so we can find another board if autoIRQ fails. */
 	/* WTF is going on here? */
 	if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
@@ -1391,9 +1349,6 @@ net_open(struct net_device *dev)
 	case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break;
         default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2);
         }
-#ifdef CONFIG_ARCH_PNX010X
-	result = A_CNF_10B_T;
-#endif
         if (!result) {
                 printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);
 release_dma:
-- 
1.7.0.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/11] Removing dead code, Christoph Egger, (Wed Jul 14, 5:39 am)
[PATCH 01/11] Removing dead RT2800PCI_SOC, Christoph Egger, (Wed Jul 14, 5:39 am)
[PATCH 02/11] Removing dead {AR,WAVE}LAN, Christoph Egger, (Wed Jul 14, 5:39 am)
[PATCH 03/11] Removing dead CASSINI_QGE_DEBUG, Christoph Egger, (Wed Jul 14, 5:39 am)
[PATCH 04/11] Removing dead CASSINI_MULTICAST_REG_WRITE, Christoph Egger, (Wed Jul 14, 5:40 am)
[PATCH 05/11] Removing dead CASSINI_NAPI, Christoph Egger, (Wed Jul 14, 5:40 am)
[PATCH 06/11] Removing dead CHELSIO_T1_COUGAR, Christoph Egger, (Wed Jul 14, 5:41 am)
[PATCH 07/11] Removing dead ARCH_PNX010X, Christoph Egger, (Wed Jul 14, 5:41 am)
[PATCH 08/11] Removing dead SH_HICOSH4, Christoph Egger, (Wed Jul 14, 5:41 am)
[PATCH 10/11] Removing dead NETWINDER_{T,R}X_DMA_PROBLEMS, Christoph Egger, (Wed Jul 14, 5:41 am)
[PATCH 11/11] Removing dead REDWOOD_{5,6}, Christoph Egger, (Wed Jul 14, 5:41 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Luis Correia, (Wed Jul 14, 5:46 am)
Re: [PATCH 11/11] Removing dead REDWOOD_{5,6}, Nicolas Pitre, (Wed Jul 14, 5:48 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Ivo Van Doorn, (Wed Jul 14, 5:52 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, John W. Linville, (Wed Jul 14, 6:15 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Bartlomiej Zolnierki ..., (Wed Jul 14, 7:14 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Felix Fietkau, (Wed Jul 14, 7:44 am)
Re: [PATCH 02/11] Removing dead {AR,WAVE}LAN, David Miller, (Wed Jul 14, 12:17 pm)
Re: [PATCH 03/11] Removing dead CASSINI_QGE_DEBUG, David Miller, (Wed Jul 14, 12:18 pm)
Re: [PATCH 05/11] Removing dead CASSINI_NAPI, David Miller, (Wed Jul 14, 1:36 pm)
Re: [PATCH 06/11] Removing dead CHELSIO_T1_COUGAR, David Miller, (Wed Jul 14, 1:37 pm)
Re: [PATCH 07/11] Removing dead ARCH_PNX010X, David Miller, (Wed Jul 14, 1:39 pm)
Re: [PATCH 08/11] Removing dead SH_HICOSH4, David Miller, (Wed Jul 14, 1:40 pm)
Re: [PATCH 11/11] Removing dead REDWOOD_{5,6}, David Miller, (Wed Jul 14, 1:44 pm)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Bartlomiej Zolnierki ..., (Thu Jul 15, 1:41 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Gertjan van Wingerde, (Fri Jul 16, 12:18 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Helmut Schaa, (Fri Jul 16, 3:08 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Gertjan van Wingerde, (Fri Jul 16, 8:46 am)
Re: [PATCH 01/11] Removing dead RT2800PCI_SOC, Helmut Schaa, (Fri Jul 16, 10:44 am)
Re: [PATCH 07/11] Removing dead ARCH_PNX010X, Christoph Egger, (Mon Jul 19, 7:37 am)