diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2013-08-30 09:17:07 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2013-09-16 21:19:04 -0400 |
| commit | d95353e47a3ff67b3cd6554e5f4590774a95816c (patch) | |
| tree | 0c8dfd49aa3395050f835af1199f0e4f296e20c9 | |
| parent | 77da71b3a03ebb2bd06500ca1d85e1c5083bb005 (diff) | |
net/ethernet: smsc9194: Drop conditional code for H8/300
With the H8/300 architecture gone, this code is no longer necessary.
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/net/ethernet/smsc/smc9194.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c index e85c2e7e8246..afd9873e9bdb 100644 --- a/drivers/net/ethernet/smsc/smc9194.c +++ b/drivers/net/ethernet/smsc/smc9194.c | |||
| @@ -95,14 +95,6 @@ static const char version[] = | |||
| 95 | #define USE_32_BIT 1 | 95 | #define USE_32_BIT 1 |
| 96 | #endif | 96 | #endif |
| 97 | 97 | ||
| 98 | #if defined(__H8300H__) || defined(__H8300S__) | ||
| 99 | #define NO_AUTOPROBE | ||
| 100 | #undef insl | ||
| 101 | #undef outsl | ||
| 102 | #define insl(a,b,l) io_insl_noswap(a,b,l) | ||
| 103 | #define outsl(a,b,l) io_outsl_noswap(a,b,l) | ||
| 104 | #endif | ||
| 105 | |||
| 106 | /* | 98 | /* |
| 107 | .the SMC9194 can be at any of the following port addresses. To change, | 99 | .the SMC9194 can be at any of the following port addresses. To change, |
| 108 | .for a slightly different card, you can add it to the array. Keep in | 100 | .for a slightly different card, you can add it to the array. Keep in |
| @@ -114,12 +106,6 @@ struct devlist { | |||
| 114 | unsigned int irq; | 106 | unsigned int irq; |
| 115 | }; | 107 | }; |
| 116 | 108 | ||
| 117 | #if defined(CONFIG_H8S_EDOSK2674) | ||
| 118 | static struct devlist smc_devlist[] __initdata = { | ||
| 119 | {.port = 0xf80000, .irq = 16}, | ||
| 120 | {.port = 0, .irq = 0 }, | ||
| 121 | }; | ||
| 122 | #else | ||
| 123 | static struct devlist smc_devlist[] __initdata = { | 109 | static struct devlist smc_devlist[] __initdata = { |
| 124 | {.port = 0x200, .irq = 0}, | 110 | {.port = 0x200, .irq = 0}, |
| 125 | {.port = 0x220, .irq = 0}, | 111 | {.port = 0x220, .irq = 0}, |
| @@ -139,7 +125,6 @@ static struct devlist smc_devlist[] __initdata = { | |||
| 139 | {.port = 0x3E0, .irq = 0}, | 125 | {.port = 0x3E0, .irq = 0}, |
| 140 | {.port = 0, .irq = 0}, | 126 | {.port = 0, .irq = 0}, |
| 141 | }; | 127 | }; |
| 142 | #endif | ||
| 143 | /* | 128 | /* |
| 144 | . Wait time for memory to be free. This probably shouldn't be | 129 | . Wait time for memory to be free. This probably shouldn't be |
| 145 | . tuned that much, as waiting for this means nothing else happens | 130 | . tuned that much, as waiting for this means nothing else happens |
| @@ -651,11 +636,7 @@ static void smc_hardware_send_packet( struct net_device * dev ) | |||
| 651 | #ifdef USE_32_BIT | 636 | #ifdef USE_32_BIT |
| 652 | if ( length & 0x2 ) { | 637 | if ( length & 0x2 ) { |
| 653 | outsl(ioaddr + DATA_1, buf, length >> 2 ); | 638 | outsl(ioaddr + DATA_1, buf, length >> 2 ); |
| 654 | #if !defined(__H8300H__) && !defined(__H8300S__) | ||
| 655 | outw( *((word *)(buf + (length & 0xFFFFFFFC))),ioaddr +DATA_1); | 639 | outw( *((word *)(buf + (length & 0xFFFFFFFC))),ioaddr +DATA_1); |
| 656 | #else | ||
| 657 | ctrl_outw( *((word *)(buf + (length & 0xFFFFFFFC))),ioaddr +DATA_1); | ||
| 658 | #endif | ||
| 659 | } | 640 | } |
| 660 | else | 641 | else |
| 661 | outsl(ioaddr + DATA_1, buf, length >> 2 ); | 642 | outsl(ioaddr + DATA_1, buf, length >> 2 ); |
| @@ -899,7 +880,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
| 899 | retval = -ENODEV; | 880 | retval = -ENODEV; |
| 900 | goto err_out; | 881 | goto err_out; |
| 901 | } | 882 | } |
| 902 | #if !defined(CONFIG_H8S_EDOSK2674) | ||
| 903 | /* well, we've already written once, so hopefully another time won't | 883 | /* well, we've already written once, so hopefully another time won't |
| 904 | hurt. This time, I need to switch the bank register to bank 1, | 884 | hurt. This time, I need to switch the bank register to bank 1, |
| 905 | so I can access the base address register */ | 885 | so I can access the base address register */ |
| @@ -914,10 +894,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
| 914 | retval = -ENODEV; | 894 | retval = -ENODEV; |
| 915 | goto err_out; | 895 | goto err_out; |
| 916 | } | 896 | } |
| 917 | #else | ||
| 918 | (void)base_address_register; /* Warning suppression */ | ||
| 919 | #endif | ||
| 920 | |||
| 921 | 897 | ||
| 922 | /* check if the revision register is something that I recognize. | 898 | /* check if the revision register is something that I recognize. |
| 923 | These might need to be added to later, as future revisions | 899 | These might need to be added to later, as future revisions |
