| Message ID | 20201127165550.2693417-1-trix@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: bna: remove trailing semicolon in macro definition | expand |
On Fri, 27 Nov 2020 08:55:50 -0800 trix@redhat.com wrote: > From: Tom Rix <trix@redhat.com> > > The macro use will already have a semicolon. > > Signed-off-by: Tom Rix <trix@redhat.com> > --- > drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h > index f335b7115c1b..4b19855017d7 100644 > --- a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h > +++ b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h > @@ -218,7 +218,7 @@ do { \ > > /* Set the coalescing timer for the given ib */ > #define bna_ib_coalescing_timer_set(_i_dbell, _cls_timer) \ > - ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)); > + ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)) > > /* Acks 'events' # of events for a given ib while disabling interrupts */ > #define bna_ib_ack_disable_irq(_i_dbell, _events) \ > @@ -260,7 +260,7 @@ do { \ > > #define bna_txq_prod_indx_doorbell(_tcb) \ > (writel(BNA_DOORBELL_Q_PRD_IDX((_tcb)->producer_index), \ > - (_tcb)->q_dbell)); > + (_tcb)->q_dbell)) > > #define bna_rxq_prod_indx_doorbell(_rcb) \ > (writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)->producer_index), \ Same story here as Daniel pointed out for the BPF patch. There are 2 macros right below here which also have a semicolon at the end. And these ones are used. So the patch appears to be pretty arbitrary.
On 11/30/20 7:01 PM, Jakub Kicinski wrote: > On Fri, 27 Nov 2020 08:55:50 -0800 trix@redhat.com wrote: >> From: Tom Rix <trix@redhat.com> >> >> The macro use will already have a semicolon. >> >> Signed-off-by: Tom Rix <trix@redhat.com> >> --- >> drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h >> index f335b7115c1b..4b19855017d7 100644 >> --- a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h >> +++ b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h >> @@ -218,7 +218,7 @@ do { \ >> >> /* Set the coalescing timer for the given ib */ >> #define bna_ib_coalescing_timer_set(_i_dbell, _cls_timer) \ >> - ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)); >> + ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)) >> >> /* Acks 'events' # of events for a given ib while disabling interrupts */ >> #define bna_ib_ack_disable_irq(_i_dbell, _events) \ >> @@ -260,7 +260,7 @@ do { \ >> >> #define bna_txq_prod_indx_doorbell(_tcb) \ >> (writel(BNA_DOORBELL_Q_PRD_IDX((_tcb)->producer_index), \ >> - (_tcb)->q_dbell)); >> + (_tcb)->q_dbell)) >> >> #define bna_rxq_prod_indx_doorbell(_rcb) \ >> (writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)->producer_index), \ > Same story here as Daniel pointed out for the BPF patch. > > There are 2 macros right below here which also have a semicolon at the > end. And these ones are used. So the patch appears to be pretty arbitrary. I will add the other macros in the next revision. Sorry, Tom >
diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h index f335b7115c1b..4b19855017d7 100644 --- a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h +++ b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h @@ -218,7 +218,7 @@ do { \ /* Set the coalescing timer for the given ib */ #define bna_ib_coalescing_timer_set(_i_dbell, _cls_timer) \ - ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)); + ((_i_dbell)->doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0)) /* Acks 'events' # of events for a given ib while disabling interrupts */ #define bna_ib_ack_disable_irq(_i_dbell, _events) \ @@ -260,7 +260,7 @@ do { \ #define bna_txq_prod_indx_doorbell(_tcb) \ (writel(BNA_DOORBELL_Q_PRD_IDX((_tcb)->producer_index), \ - (_tcb)->q_dbell)); + (_tcb)->q_dbell)) #define bna_rxq_prod_indx_doorbell(_rcb) \ (writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)->producer_index), \