drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function

To introduce generic set_bit_le() later, we remove our own definition
and use a proper non-atomic bitops function: __set_bit_le().

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 61cc0934286582844279338f42d7b80fec942b81..77335853ac364bcedbadcec6449ddac45b71359b 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -661,9 +661,6 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,
    new frame, not around filling de->setup_frame.  This is non-deterministic
    when re-entered but still correct. */
 
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
-
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
        struct de_private *de = netdev_priv(dev);
@@ -673,12 +670,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
        u16 *eaddrs;
 
        memset(hash_table, 0, sizeof(hash_table));
-       set_bit_le(255, hash_table);                    /* Broadcast entry */
+       __set_bit_le(255, hash_table);                  /* Broadcast entry */
        /* This should work on big-endian machines as well. */
        netdev_for_each_mc_addr(ha, dev) {
                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
-               set_bit_le(index, hash_table);
+               __set_bit_le(index, hash_table);
        }
 
        for (i = 0; i < 32; i++) {

diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index c4f37aca22699a5700b561bf72253c428a35247e..885700a199785a6b840b5cf4bddb9494d8f5bc67 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1010,9 +1010,6 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
    new frame, not around filling tp->setup_frame.  This is non-deterministic
    when re-entered but still correct. */
 
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
-
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
        struct tulip_private *tp = netdev_priv(dev);
@@ -1022,12 +1019,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
        u16 *eaddrs;
 
        memset(hash_table, 0, sizeof(hash_table));
-       set_bit_le(255, hash_table);                    /* Broadcast entry */
+       __set_bit_le(255, hash_table);                  /* Broadcast entry */
        /* This should work on big-endian machines as well. */
        netdev_for_each_mc_addr(ha, dev) {
                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
-               set_bit_le(index, hash_table);
+               __set_bit_le(index, hash_table);
        }
        for (i = 0; i < 32; i++) {
                *setup_frm++ = hash_table[i];