mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christoph Egger <siccegge@cs.fau.de>
To: "David S. Miller" <davem@davemloft.net>,
	Joe Perches <joe@perches.com>,
	Stephen Hemminger <shemminger@vyatta.com>,
	Dongdong Deng <dongdong.deng@windriver.com>,
	Jiri Kosina <jkosina@suse.cz>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: vamos-dev@i4.informatik.uni-erlangen.de
Subject: [PATCH 07/11] Removing dead ARCH_PNX010X
Date: Wed, 14 Jul 2010 14:41:09 +0200	[thread overview]
Message-ID: <395890e97bb1e879725ea56562f362d4af61c463.1279110895.git.siccegge@cs.fau.de> (raw)
In-Reply-To: <cover.1279110894.git.siccegge@cs.fau.de>

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


  parent reply	other threads:[~2010-07-14 12:41 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-14 12:39 [PATCH 00/11] Removing dead code Christoph Egger
2010-07-14 12:39 ` [PATCH 01/11] Removing dead RT2800PCI_SOC Christoph Egger
2010-07-14 12:46   ` Luis Correia
2010-07-14 12:52     ` Ivo Van Doorn
2010-07-14 13:15       ` John W. Linville
2010-07-14 14:44         ` Felix Fietkau
2010-07-15  8:41           ` Bartlomiej Zolnierkiewicz
     [not found]             ` <AANLkTilqoYMMKYJT-YYbEzdnytUSYa0EylEiJ4x5xXXH@mail.gmail.com>
2010-07-16  7:18               ` Gertjan van Wingerde
2010-07-16 10:08                 ` Helmut Schaa
2010-07-16 15:46                   ` Gertjan van Wingerde
2010-07-16 17:44                     ` Helmut Schaa
2010-07-14 14:14       ` Bartlomiej Zolnierkiewicz
2010-07-14 12:39 ` [PATCH 02/11] Removing dead {AR,WAVE}LAN Christoph Egger
2010-07-14 19:17   ` David Miller
2010-07-14 12:39 ` [PATCH 03/11] Removing dead CASSINI_QGE_DEBUG Christoph Egger
2010-07-14 19:18   ` David Miller
2010-07-14 12:40 ` [PATCH 04/11] Removing dead CASSINI_MULTICAST_REG_WRITE Christoph Egger
2010-07-14 12:40 ` [PATCH 05/11] Removing dead CASSINI_NAPI Christoph Egger
2010-07-14 20:36   ` David Miller
2010-07-14 12:41 ` [PATCH 06/11] Removing dead CHELSIO_T1_COUGAR Christoph Egger
2010-07-14 20:37   ` David Miller
2010-07-14 12:41 ` Christoph Egger [this message]
2010-07-14 20:39   ` [PATCH 07/11] Removing dead ARCH_PNX010X David Miller
2010-07-19 14:37     ` Christoph Egger
2010-07-14 12:41 ` [PATCH 08/11] Removing dead SH_HICOSH4 Christoph Egger
2010-07-14 20:40   ` David Miller
2010-07-14 12:41 ` [PATCH 09/11] Removing dead ETRAX_NETWORK_RED_ON_NO_CONNECTION Christoph Egger
2010-07-14 20:42   ` David Miller
2010-07-30 17:28   ` Jesper Nilsson
2010-07-14 12:41 ` [PATCH 10/11] Removing dead NETWINDER_{T,R}X_DMA_PROBLEMS Christoph Egger
2010-07-14 20:43   ` David Miller
2010-07-14 12:41 ` [PATCH 11/11] Removing dead REDWOOD_{5,6} Christoph Egger
2010-07-14 12:48   ` Nicolas Pitre
2010-07-14 20:44   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=395890e97bb1e879725ea56562f362d4af61c463.1279110895.git.siccegge@cs.fau.de \
    --to=siccegge@cs.fau.de \
    --cc=davem@davemloft.net \
    --cc=dongdong.deng@windriver.com \
    --cc=jkosina@suse.cz \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=shemminger@vyatta.com \
    --cc=vamos-dev@i4.informatik.uni-erlangen.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®