brocade: Convert uses of __constant_<foo> to <foo>

The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index aeec9ccc0b39..cb7625366ec2 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2845,13 +2845,11 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
                 }
                 if (unlikely((gso_size + skb_transport_offset(skb) +
                               tcp_hdrlen(skb)) >= skb->len)) {
-                        txqent->hdr.wi.opcode =
-                                __constant_htons(BNA_TXQ_WI_SEND);
+                        txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);
                         txqent->hdr.wi.lso_mss = 0;
                         BNAD_UPDATE_CTR(bnad, tx_skb_tso_too_short);
                 } else {
-                        txqent->hdr.wi.opcode =
-                                __constant_htons(BNA_TXQ_WI_SEND_LSO);
+                        txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND_LSO);
                         txqent->hdr.wi.lso_mss = htons(gso_size);
                 }
 
@@ -2865,7 +2863,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
                         htons(BNA_TXQ_WI_L4_HDR_N_OFFSET(
                         tcp_hdrlen(skb) >> 2, skb_transport_offset(skb)));
         } else  {
-                txqent->hdr.wi.opcode = __constant_htons(BNA_TXQ_WI_SEND);
+                txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);
                 txqent->hdr.wi.lso_mss = 0;
 
                 if (unlikely(skb->len > (bnad->netdev->mtu + ETH_HLEN))) {
@@ -2876,11 +2874,10 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         u8 proto = 0;
 
-                        if (skb->protocol == __constant_htons(ETH_P_IP))
+                        if (skb->protocol == htons(ETH_P_IP))
                                 proto = ip_hdr(skb)->protocol;
 #ifdef NETIF_F_IPV6_CSUM
-                        else if (skb->protocol ==
-                                 __constant_htons(ETH_P_IPV6)) {
+                        else if (skb->protocol == htons(ETH_P_IPV6)) {
                                 /* nexthdr may not be TCP immediately. */
                                 proto = ipv6_hdr(skb)->nexthdr;
                         }
@@ -3062,8 +3059,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                         vect_id = 0;
                         BNA_QE_INDX_INC(prod, q_depth);
                         txqent = &((struct bna_txq_entry *)tcb->sw_q)[prod];
-                        txqent->hdr.wi_ext.opcode =
-                                __constant_htons(BNA_TXQ_WI_EXTENSION);
+                        txqent->hdr.wi_ext.opcode = htons(BNA_TXQ_WI_EXTENSION);
                         unmap = &unmap_q[prod];
                 }