@@ -191,12 +191,10 @@ static void aq_nic_service_timer_cb(struct timer_list *t)
191
191
static void aq_nic_polling_timer_cb (struct timer_list * t )
192
192
{
193
193
struct aq_nic_s * self = from_timer (self , t , polling_timer );
194
- struct aq_vec_s * aq_vec = NULL ;
195
194
unsigned int i = 0U ;
196
195
197
- for (i = 0U , aq_vec = self -> aq_vec [0 ];
198
- self -> aq_vecs > i ; ++ i , aq_vec = self -> aq_vec [i ])
199
- aq_vec_isr (i , (void * )aq_vec );
196
+ for (i = 0U ; self -> aq_vecs > i ; ++ i )
197
+ aq_vec_isr (i , (void * )self -> aq_vec [i ]);
200
198
201
199
mod_timer (& self -> polling_timer , jiffies +
202
200
AQ_CFG_POLLING_TIMER_INTERVAL );
@@ -653,7 +651,6 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
653
651
{
654
652
unsigned int i = 0U ;
655
653
unsigned int count = 0U ;
656
- struct aq_vec_s * aq_vec = NULL ;
657
654
struct aq_stats_s * stats = self -> aq_hw_ops -> hw_get_hw_stats (self -> aq_hw );
658
655
659
656
if (!stats )
@@ -686,10 +683,11 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
686
683
687
684
data += i ;
688
685
689
- for (i = 0U , aq_vec = self -> aq_vec [0 ];
690
- aq_vec && self -> aq_vecs > i ; ++ i , aq_vec = self -> aq_vec [i ]) {
686
+ for (i = 0U ; self -> aq_vecs > i ; ++ i ) {
687
+ if (!self -> aq_vec [i ])
688
+ break ;
691
689
data += count ;
692
- aq_vec_get_sw_stats (aq_vec , data , & count );
690
+ aq_vec_get_sw_stats (self -> aq_vec [ i ] , data , & count );
693
691
}
694
692
695
693
err_exit :;
@@ -867,7 +865,6 @@ u32 aq_nic_get_fw_version(struct aq_nic_s *self)
867
865
868
866
int aq_nic_stop (struct aq_nic_s * self )
869
867
{
870
- struct aq_vec_s * aq_vec = NULL ;
871
868
unsigned int i = 0U ;
872
869
873
870
netif_tx_disable (self -> ndev );
@@ -882,9 +879,8 @@ int aq_nic_stop(struct aq_nic_s *self)
882
879
else
883
880
aq_pci_func_free_irqs (self );
884
881
885
- for (i = 0U , aq_vec = self -> aq_vec [0 ];
886
- self -> aq_vecs > i ; ++ i , aq_vec = self -> aq_vec [i ])
887
- aq_vec_stop (aq_vec );
882
+ for (i = 0U ; self -> aq_vecs > i ; ++ i )
883
+ aq_vec_stop (self -> aq_vec [i ]);
888
884
889
885
return self -> aq_hw_ops -> hw_stop (self -> aq_hw );
890
886
}
@@ -986,4 +982,4 @@ void aq_nic_shutdown(struct aq_nic_s *self)
986
982
987
983
err_exit :
988
984
rtnl_unlock ();
989
- }
985
+ }
0 commit comments