bonding: Remove unnecessary returned value check

The function bond_info_query alwarys returns 0. As such, in the function
bond_do_ioctl, it is not necessary to check the returned value. So the
interface type of the function bond_info_query is changed to void. The
redundant check is removed.

Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 36919221b3f0cd71feaffb929e467a86fc399dec..e6af04716cf7e86dd422b1acfe17490659b815db 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1993,11 +1993,10 @@ static int  bond_release_and_destroy(struct net_device *bond_dev,
        return ret;
 }
 
-static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
+static void bond_info_query(struct net_device *bond_dev, struct ifbond *info)
 {
        struct bonding *bond = netdev_priv(bond_dev);
        bond_fill_ifbond(bond, info);
-       return 0;
 }
 
 static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
@@ -3409,12 +3408,11 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                if (copy_from_user(&k_binfo, u_binfo, sizeof(ifbond)))
                        return -EFAULT;
 
-               res = bond_info_query(bond_dev, &k_binfo);
-               if (res == 0 &&
-                   copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
+               bond_info_query(bond_dev, &k_binfo);
+               if (copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
                        return -EFAULT;
 
-               return res;
+               return 0;
        case BOND_SLAVE_INFO_QUERY_OLD:
        case SIOCBONDSLAVEINFOQUERY:
                u_sinfo = (struct ifslave __user *)ifr->ifr_data;