Message ID | 20191108142331.10221-14-anthony.l.nguyen@intel.com |
---|---|
State | Accepted |
Delegated to: | Jeff Kirsher |
Headers | show |
Series | [S33,01/15] ice: Store number of functions for the device | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Tony Nguyen > Sent: Friday, November 8, 2019 6:24 AM > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [PATCH S33 14/15] ice: remove pointless NULL > check of port_info > > From: Jacob Keller <jacob.e.keller@intel.com> > > The code in ice_sched_cleanup_all checks whether the port info is NULL prior > to calling ice_sched_clear_port. However, ice_sched_clear_port already > checks whether port info is non-NULL. > > More importantly, it also checks whether the port structure has been > initialized by checking its port_state field as well. > > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_sched.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c index b1bdb40a1bee..9c64b5cd0c91 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.c +++ b/drivers/net/ethernet/intel/ice/ice_sched.c @@ -798,8 +798,7 @@ void ice_sched_cleanup_all(struct ice_hw *hw) hw->layer_info = NULL; } - if (hw->port_info) - ice_sched_clear_port(hw->port_info); + ice_sched_clear_port(hw->port_info); hw->num_tx_sched_layers = 0; hw->num_tx_sched_phys_layers = 0;