ice: Remove casts on void pointers in LAG code

This series will be touching on the LAG code in the ice driver,
to prevent moving or propagating casting on void pointers, clean
them up first.

This also allows for moving the variable initialization into the
variable declaration.

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c
index b1129da72139488e159814d20ecc370427497fd3..96b11d8f1422318cb67914b74474807bbaaa3228 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lag.c
+++ b/drivers/net/ethernet/intel/ice/ice_lag.c
@@ -321,7 +321,7 @@ ice_lag_cfg_drop_fltr(struct ice_lag *lag, bool add)
 static void
 ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)
 {
-       struct netdev_notifier_bonding_info *info;
+       struct netdev_notifier_bonding_info *info = ptr;
        struct netdev_bonding_info *bonding_info;
        struct net_device *event_netdev;
        struct device *dev;
@@ -331,7 +331,6 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)
        if (event_netdev != lag->netdev)
                return;
 
-       info = (struct netdev_notifier_bonding_info *)ptr;
        bonding_info = &info->bonding_info;
        dev = ice_pf_to_dev(lag->pf);
 
@@ -873,13 +872,12 @@ void ice_lag_complete_vf_reset(struct ice_lag *lag, u8 act_prt)
  */
 static void ice_lag_info_event(struct ice_lag *lag, void *ptr)
 {
-       struct netdev_notifier_bonding_info *info;
+       struct netdev_notifier_bonding_info *info = ptr;
        struct netdev_bonding_info *bonding_info;
        struct net_device *event_netdev;
        const char *lag_netdev_name;
 
        event_netdev = netdev_notifier_info_to_dev(ptr);
-       info = ptr;
        lag_netdev_name = netdev_name(lag->netdev);
        bonding_info = &info->bonding_info;
 
@@ -1344,11 +1342,10 @@ static void ice_lag_init_feature_support_flag(struct ice_pf *pf)
  */
 static void ice_lag_changeupper_event(struct ice_lag *lag, void *ptr)
 {
-       struct netdev_notifier_changeupper_info *info;
+       struct netdev_notifier_changeupper_info *info = ptr;
        struct ice_lag *primary_lag;
        struct net_device *netdev;
 
-       info = ptr;
        netdev = netdev_notifier_info_to_dev(ptr);
 
        /* not for this netdev */
@@ -1408,7 +1405,7 @@ static void ice_lag_changeupper_event(struct ice_lag *lag, void *ptr)
  */
 static void ice_lag_monitor_link(struct ice_lag *lag, void *ptr)
 {
-       struct netdev_notifier_changeupper_info *info;
+       struct netdev_notifier_changeupper_info *info = ptr;
        struct ice_hw *prim_hw, *active_hw;
        struct net_device *event_netdev;
        struct ice_pf *pf;
@@ -1425,7 +1422,6 @@ static void ice_lag_monitor_link(struct ice_lag *lag, void *ptr)
        prim_hw = &pf->hw;
        prim_port = prim_hw->port_info->lport;
 
-       info = (struct netdev_notifier_changeupper_info *)ptr;
        if (info->upper_dev != lag->upper_netdev)
                return;
 
@@ -1454,8 +1450,8 @@ static void ice_lag_monitor_link(struct ice_lag *lag, void *ptr)
  */
 static void ice_lag_monitor_active(struct ice_lag *lag, void *ptr)
 {
+       struct netdev_notifier_bonding_info *info = ptr;
        struct net_device *event_netdev, *event_upper;
-       struct netdev_notifier_bonding_info *info;
        struct netdev_bonding_info *bonding_info;
        struct ice_netdev_priv *event_np;
        struct ice_pf *pf, *event_pf;
@@ -1480,7 +1476,6 @@ static void ice_lag_monitor_active(struct ice_lag *lag, void *ptr)
        event_port = event_pf->hw.port_info->lport;
        prim_port = pf->hw.port_info->lport;
 
-       info = (struct netdev_notifier_bonding_info *)ptr;
        bonding_info = &info->bonding_info;
 
        if (!bonding_info->slave.state) {
@@ -1527,8 +1522,8 @@ static void ice_lag_monitor_active(struct ice_lag *lag, void *ptr)
 static bool
 ice_lag_chk_comp(struct ice_lag *lag, void *ptr)
 {
+       struct netdev_notifier_bonding_info *info = ptr;
        struct net_device *event_netdev, *event_upper;
-       struct netdev_notifier_bonding_info *info;
        struct netdev_bonding_info *bonding_info;
        struct list_head *tmp;
        struct device *dev;
@@ -1554,7 +1549,6 @@ ice_lag_chk_comp(struct ice_lag *lag, void *ptr)
                return false;
        }
 
-       info = (struct netdev_notifier_bonding_info *)ptr;
        bonding_info = &info->bonding_info;
        lag->bond_mode = bonding_info->master.bond_mode;
        if (lag->bond_mode != BOND_MODE_ACTIVEBACKUP) {
@@ -1664,10 +1658,9 @@ ice_lag_unregister(struct ice_lag *lag, struct net_device *event_netdev)
 static void
 ice_lag_monitor_rdma(struct ice_lag *lag, void *ptr)
 {
-       struct netdev_notifier_changeupper_info *info;
+       struct netdev_notifier_changeupper_info *info = ptr;
        struct net_device *netdev;
 
-       info = ptr;
        netdev = netdev_notifier_info_to_dev(ptr);
 
        if (netdev != lag->netdev)
@@ -1837,9 +1830,8 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event,
        lag_work->lag = lag;
        lag_work->event = event;
        if (event == NETDEV_CHANGEUPPER) {
-               struct netdev_notifier_changeupper_info *info;
+               struct netdev_notifier_changeupper_info *info = ptr;
 
-               info = ptr;
                upper_netdev = info->upper_dev;
        } else {
                upper_netdev = netdev_master_upper_dev_get(netdev);