From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Dooks Subject: DM9000: Remove blackfin as special case. Date: Mon, 16 Jun 2008 00:36:48 +0100 Message-ID: <20080615233648.597885961@fluff.org.uk> Cc: cooloney@kernel.org, Ben Dooks To: netdev@vger.kernel.org Return-path: Received: from aeryn.fluff.org.uk ([87.194.8.8]:54278 "EHLO kira.home.fluff.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752196AbYFOXgv (ORCPT ); Sun, 15 Jun 2008 19:36:51 -0400 Content-Disposition: inline; filename=simtec/simtec-drivers-net-dm9000-remove-blackfin-hackery.patch Sender: netdev-owner@vger.kernel.org List-ID: 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 Signed-off-by: Ben Dooks 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'