From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH 3/7] net/ethernet: smsc: Drop conditional code for H8/300 Date: Fri, 30 Aug 2013 09:40:38 -0700 Message-ID: <1377880842-6835-4-git-send-email-linux@roeck-us.net> References: <1377880842-6835-1-git-send-email-linux@roeck-us.net> Cc: linux-ide@vger.kernel.org, netdev@vger.kernel.org, linux-watchdog@vger.kernel.org, Wim Van Sebroeck , "David S. Miller" , Al Viro , Eric Paris , Greg Kroah-Hartman , Jiang Liu , David Howells , Thomas Gleixner , Stephen Rothwell , Linus Torvalds , Guenter Roeck To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1377880842-6835-1-git-send-email-linux@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org With the H8/300 architecture gone, this code is no longer necessary. Signed-off-by: Guenter Roeck --- drivers/net/ethernet/smsc/smc9194.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c index e85c2e7..814f59b 100644 --- a/drivers/net/ethernet/smsc/smc9194.c +++ b/drivers/net/ethernet/smsc/smc9194.c @@ -95,14 +95,6 @@ static const char version[] = #define USE_32_BIT 1 #endif -#if defined(__H8300H__) || defined(__H8300S__) -#define NO_AUTOPROBE -#undef insl -#undef outsl -#define insl(a,b,l) io_insl_noswap(a,b,l) -#define outsl(a,b,l) io_outsl_noswap(a,b,l) -#endif - /* .the SMC9194 can be at any of the following port addresses. To change, .for a slightly different card, you can add it to the array. Keep in @@ -651,11 +643,7 @@ static void smc_hardware_send_packet( struct net_device * dev ) #ifdef USE_32_BIT if ( length & 0x2 ) { outsl(ioaddr + DATA_1, buf, length >> 2 ); -#if !defined(__H8300H__) && !defined(__H8300S__) outw( *((word *)(buf + (length & 0xFFFFFFFC))),ioaddr +DATA_1); -#else - ctrl_outw( *((word *)(buf + (length & 0xFFFFFFFC))),ioaddr +DATA_1); -#endif } else outsl(ioaddr + DATA_1, buf, length >> 2 ); -- 1.7.9.7