bonding: remove the return value for bond_3ad_bind_slave()

I'm sure the operand slave and bond for the function will not
be NULL, so the check for the bond will not make any sense, so
remove the judgement, and the return value was useless here,
remove the unwanted return value.

The comments for the bond 3ad is too old, cleanup some errors
and warming.

Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 8d7483d5d3e6103dd372149717fc34d5c78129a4..81559b2dedadc8257e936566898270abd215b059 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1855,22 +1855,16 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
  * Returns:   0 on success
  *          < 0 on error
  */
-int bond_3ad_bind_slave(struct slave *slave)
+void bond_3ad_bind_slave(struct slave *slave)
 {
        struct bonding *bond = bond_get_bond_by_slave(slave);
        struct port *port;
        struct aggregator *aggregator;
 
-       if (bond == NULL) {
-               pr_err("%s: The slave %s is not attached to its bond\n",
-                      slave->bond->dev->name, slave->dev->name);
-               return -1;
-       }
-
-       //check that the slave has not been initialized yet.
+       /* check that the slave has not been initialized yet. */
        if (SLAVE_AD_INFO(slave).port.slave != slave) {
 
-               // port initialization
+               /* port initialization */
                port = &(SLAVE_AD_INFO(slave).port);
 
                ad_initialize_port(port, bond->params.lacp_fast);
@@ -1878,28 +1872,30 @@ int bond_3ad_bind_slave(struct slave *slave)
                __initialize_port_locks(slave);
                port->slave = slave;
                port->actor_port_number = SLAVE_AD_INFO(slave).id;
-               // key is determined according to the link speed, duplex and user key(which is yet not supported)
-               //              ------------------------------------------------------------
-               // Port key :   | User key                       |      Speed       |Duplex|
-               //              ------------------------------------------------------------
-               //              16                               6               1 0
-               port->actor_admin_port_key = 0; // initialize this parameter
+               /* key is determined according to the link speed, duplex and user key(which
+                * is yet not supported)
+                *              ------------------------------------------------------------
+                * Port key :   | User key                       |      Speed       |Duplex|
+                *              ------------------------------------------------------------
+                *              16                               6               1 0
+                */
+               port->actor_admin_port_key = 0; /* initialize this parameter */
                port->actor_admin_port_key |= __get_duplex(port);
                port->actor_admin_port_key |= (__get_link_speed(port) << 1);
                port->actor_oper_port_key = port->actor_admin_port_key;
-               // if the port is not full duplex, then the port should be not lacp Enabled
+               /* if the port is not full duplex, then the port should be not lacp Enabled */
                if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS))
                        port->sm_vars &= ~AD_PORT_LACP_ENABLED;
-               // actor system is the bond's system
+               /* actor system is the bond's system */
                port->actor_system = BOND_AD_INFO(bond).system.sys_mac_addr;
-               // tx timer(to verify that no more than MAX_TX_IN_SECOND lacpdu's are sent in one second)
+               /* tx timer(to verify that no more than MAX_TX_IN_SECOND lacpdu's are sent in one second) */
                port->sm_tx_timer_counter = ad_ticks_per_sec/AD_MAX_TX_IN_SECOND;
                port->aggregator = NULL;
                port->next_port_in_aggregator = NULL;
 
                __disable_port(port);
 
-               // aggregator initialization
+               /* aggregator initialization */
                aggregator = &(SLAVE_AD_INFO(slave).aggregator);
 
                ad_initialize_agg(aggregator);
@@ -1910,8 +1906,6 @@ int bond_3ad_bind_slave(struct slave *slave)
                aggregator->is_active = 0;
                aggregator->num_of_ports = 0;
        }
-
-       return 0;
 }
 
 /**

diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 5d91ad0cc04142df9e73a52a62d06e5ab4d3898e..13dc9d3c5e3460e2e0e4f01e2ab1df2a962d60e2 100644 (file)
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -265,7 +265,7 @@ struct ad_slave_info {
 
 // ================= AD Exported functions to the main bonding code ==================
 void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution);
-int  bond_3ad_bind_slave(struct slave *slave);
+void  bond_3ad_bind_slave(struct slave *slave);
 void bond_3ad_unbind_slave(struct slave *slave);
 void bond_3ad_state_machine_handler(struct work_struct *);
 void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout);