net: hsr: remove unnecessary paranthesis from the code

This patch fixes unnecessary paranthesis from the code. This is
seen when ran checkpatch.pl -f option on files under net/hsr.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 34b6d6e8020f060ce7141818464ea771f1e41ebf..cf5c3951d35a0c0f0278592c9a7fe18e0bf68d6d 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -67,7 +67,7 @@ static bool hsr_check_carrier(struct hsr_port *master)
 
        rcu_read_lock();
        hsr_for_each_port(master->hsr, port)
-               if ((port->type != HSR_PT_MASTER) && is_slave_up(port->dev)) {
+               if (port->type != HSR_PT_MASTER && is_slave_up(port->dev)) {
                        has_carrier = true;
                        break;
                }
@@ -88,15 +88,14 @@ static void hsr_check_announce(struct net_device *hsr_dev,
 
        hsr = netdev_priv(hsr_dev);
 
-       if ((hsr_dev->operstate == IF_OPER_UP)
-                       && (old_operstate != IF_OPER_UP)) {
+       if (hsr_dev->operstate == IF_OPER_UP && old_operstate != IF_OPER_UP) {
                /* Went up */
                hsr->announce_count = 0;
                mod_timer(&hsr->announce_timer,
                          jiffies + msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL));
        }
 
-       if ((hsr_dev->operstate != IF_OPER_UP) && (old_operstate == IF_OPER_UP))
+       if (hsr_dev->operstate != IF_OPER_UP && old_operstate == IF_OPER_UP)
                /* Went down */
                del_timer(&hsr->announce_timer);
 }

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index 70220e5a389aea1dc47c44b537b15a48cfb195ca..fdc191015208bc74931e3d3786deb71b5de20fb2 100644 (file)
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -77,12 +77,11 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)
                     &((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;
        }
 
-       if ((hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE) &&
-           (hsrSupTag->HSR_TLV_Type != HSR_TLV_LIFE_CHECK))
+       if (hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE &&
+           hsrSupTag->HSR_TLV_Type != HSR_TLV_LIFE_CHECK)
                return false;
-       if ((hsrSupTag->HSR_TLV_Length != 12) &&
-                       (hsrSupTag->HSR_TLV_Length !=
-                                       sizeof(struct hsr_sup_payload)))
+       if (hsrSupTag->HSR_TLV_Length != 12 &&
+           hsrSupTag->HSR_TLV_Length != sizeof(struct hsr_sup_payload))
                return false;
 
        return true;
@@ -191,7 +190,7 @@ static struct sk_buff *frame_get_tagged_skb(struct hsr_frame_info *frame,
        if (frame->skb_hsr)
                return skb_clone(frame->skb_hsr, GFP_ATOMIC);
 
-       if ((port->type != HSR_PT_SLAVE_A) && (port->type != HSR_PT_SLAVE_B)) {
+       if (port->type != HSR_PT_SLAVE_A && port->type != HSR_PT_SLAVE_B) {
                WARN_ONCE(1, "HSR: Bug: trying to create a tagged frame for a non-ring port");
                return NULL;
        }
@@ -255,11 +254,11 @@ static void hsr_forward_do(struct hsr_frame_info *frame)
                        continue;
 
                /* Don't deliver locally unless we should */
-               if ((port->type == HSR_PT_MASTER) && !frame->is_local_dest)
+               if (port->type == HSR_PT_MASTER && !frame->is_local_dest)
                        continue;
 
                /* Deliver frames directly addressed to us to master only */
-               if ((port->type != HSR_PT_MASTER) && frame->is_local_exclusive)
+               if (port->type != HSR_PT_MASTER && frame->is_local_exclusive)
                        continue;
 
                /* Don't send frame over port where it has been sent before */
@@ -267,7 +266,7 @@ static void hsr_forward_do(struct hsr_frame_info *frame)
                                           frame->sequence_nr))
                        continue;
 
-               if (frame->is_supervision && (port->type == HSR_PT_MASTER)) {
+               if (frame->is_supervision && port->type == HSR_PT_MASTER) {
                        hsr_handle_sup_frame(frame->skb_hsr,
                                             frame->node_src,
                                             frame->port_rcv);
@@ -301,9 +300,9 @@ static void check_local_dest(struct hsr_priv *hsr, struct sk_buff *skb,
                frame->is_local_exclusive = false;
        }
 
-       if ((skb->pkt_type == PACKET_HOST) ||
-           (skb->pkt_type == PACKET_MULTICAST) ||
-           (skb->pkt_type == PACKET_BROADCAST)) {
+       if (skb->pkt_type == PACKET_HOST ||
+           skb->pkt_type == PACKET_MULTICAST ||
+           skb->pkt_type == PACKET_BROADCAST) {
                frame->is_local_dest = true;
        } else {
                frame->is_local_dest = false;

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 80151c255a1dd5383392f45f3858da494a4968d7..d506c694ee256047bea59b1a43c1569b4449f7b0 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -63,8 +63,8 @@ bool hsr_port_exists(const struct net_device *dev)
 static int hsr_check_dev_ok(struct net_device *dev)
 {
        /* Don't allow HSR on non-ethernet like devices */
-       if ((dev->flags & IFF_LOOPBACK) || (dev->type != ARPHRD_ETHER) ||
-           (dev->addr_len != ETH_ALEN)) {
+       if ((dev->flags & IFF_LOOPBACK) || dev->type != ARPHRD_ETHER ||
+           dev->addr_len != ETH_ALEN) {
                netdev_info(dev, "Cannot use loopback or non-ethernet device as HSR slave.\n");
                return -EINVAL;
        }