Subject: DM9000: Remove blackfin as special case.

From: Ben Dooks <[email-masked]>
Date: Mon, 16 Jun 2008 00:36:48 +0100

The first part of remove the DEFAULT_TRIGGER should
be relatively easy to fixup in whatever blackfin archs
still use this.

The otherbits, I would recommend the relevant blackfin
IO headers should deal with defining the six functions to
the relevant blackfin implementation.

I would have sent this directly to the blackfin list, but
it is marked as subscribers only.

CC: Bryan Wu <[email-masked]>
Signed-off-by: Ben Dooks <[email-masked]>

Index: linux-2.6.26-rc6-quilt1/drivers/net/dm9000.c
===================================================================
--- linux-2.6.26-rc6-quilt1.orig/drivers/net/dm9000.c	2008-06-16 00:31:57.000000000 +0100
+++ linux-2.6.26-rc6-quilt1/drivers/net/dm9000.c	2008-06-16 00:32:17.000000000 +0100
@@ -47,18 +47,6 @@
 #define CARDNAME	"dm9000"
 #define DRV_VERSION	"1.31"
 
-#ifdef CONFIG_BLACKFIN
-#define readsb	insb
-#define readsw	insw
-#define readsl	insl
-#define writesb	outsb
-#define writesw	outsw
-#define writesl	outsl
-#define DEFAULT_TRIGGER IRQF_TRIGGER_HIGH
-#else
-#define DEFAULT_TRIGGER (0)
-#endif
-
 /*
  * Transmit timeout, default 5 seconds.
  */
@@ -1012,10 +1000,8 @@ dm9000_open(struct net_device *dev)
 	/* If there is no IRQ type specified, default to something that
 	 * may work, and tell the user that this is a problem */
 
-	if (irqflags == IRQF_TRIGGER_NONE) {
+	if (irqflags == IRQF_TRIGGER_NONE)
 		dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
-		irqflags = DEFAULT_TRIGGER;
-	}
 	
 	irqflags |= IRQF_SHARED;

-- 
Ben ([email-masked], http://www.fluff.org/)

  'a smiley only costs 4 bytes'