DM9000: Remove blackfin as special case.

DM9000: Remove blackfin as special case.

[Ben Dooks]

[-- Attachment #1: simtec/simtec-drivers-net-dm9000-remove-blackfin-hackery.patch --]
[-- Type: text/plain, Size: 1591 bytes --]

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 <cooloney@kernel.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

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 (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

Re: DM9000: Remove blackfin as special case.

[Bryan Wu]

On Mon, Jun 16, 2008 at 7:36 AM, Ben Dooks <ben-linux@fluff.org> wrote:
>

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

I think, we can pass this irqflag from the platform resource.

> 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.

Would you please send me your patch directly?

Thanks a lot
-Bryan

Re: DM9000: Remove blackfin as special case.

[Jeff Garzik]

Ben Dooks wrote:
> 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 <cooloney@kernel.org>
> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
> 
> 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;

Is this for 2.6.26 or 2.6.27?

And please CC me on net driver patches, thanks...

	Jeff

Re: DM9000: Remove blackfin as special case.

[Ben Dooks]

On Tue, Jun 17, 2008 at 11:02:02PM -0400, Jeff Garzik wrote:
> Ben Dooks wrote:

> Is this for 2.6.26 or 2.6.27?

This set is for application once 2.6.26 is released.
 
> And please CC me on net driver patches, thanks...

On all, or just patches that want applying?

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.