linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: linux-kernel@vger.kernel.org
Cc: linux-ide@vger.kernel.org, netdev@vger.kernel.org,
	linux-watchdog@vger.kernel.org, Wim Van Sebroeck <wim@iguana.be>,
	"David S. Miller" <davem@davemloft.net>,
	Al Viro <viro@zeniv.linux.org.uk>, Eric Paris <eparis@redhat.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiang Liu <jiang.liu@huawei.com>,
	David Howells <dhowells@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 3/7] net/ethernet: smsc: Drop conditional code for H8/300
Date: Fri, 30 Aug 2013 09:40:38 -0700	[thread overview]
Message-ID: <1377880842-6835-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1377880842-6835-1-git-send-email-linux@roeck-us.net>

With the H8/300 architecture gone, this code is no longer necessary.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 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


  parent reply	other threads:[~2013-08-30 16:41 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30 16:40 [PATCH 0/7] Drop support for Renesys H8/300 architecture Guenter Roeck
2013-08-30 16:40 ` [PATCH 2/7] ide: Drop H8/300 driver Guenter Roeck
2013-08-30 16:40 ` Guenter Roeck [this message]
2013-08-30 16:40 ` [PATCH 4/7] net/ethernet: Drop H8/300 Ethernet driver Guenter Roeck
2013-08-30 16:40 ` [PATCH 5/7] watchdog: Drop references to H8300 architecture Guenter Roeck
2013-08-30 16:40 ` [PATCH 6/7] Drop MAINTAINERS entry for H8/300 Guenter Roeck
2013-08-30 16:40 ` [PATCH 7/7] Drop remaining references to H8/300 architecture Guenter Roeck
2013-08-30 16:55 ` [PATCH 0/7] Drop support for Renesys " Greg Kroah-Hartman
2013-08-30 18:30   ` David Miller
2013-08-30 18:46 ` Wim Van Sebroeck
2013-08-30 19:11   ` Guenter Roeck
2013-08-30 19:14     ` Linus Torvalds
2013-08-30 19:37       ` Guenter Roeck
2013-08-31  6:44         ` Geert Uytterhoeven
2013-08-31 13:56           ` Guenter Roeck
     [not found] ` <1377880842-6835-2-git-send-email-linux@roeck-us.net>
2013-08-30 23:01   ` [PATCH 1/7] Drop support for Renesys H8/300 (h8300) architecture Sergei Shtylyov
2013-08-30 23:47     ` Guenter Roeck

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=1377880842-6835-4-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=davem@davemloft.net \
    --cc=dhowells@redhat.com \
    --cc=eparis@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jiang.liu@huawei.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wim@iguana.be \
    /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;
as well as URLs for NNTP newsgroup(s).