Skip to content

Commit 64b9d16

Browse files
nathanchancedavem330
authored andcommitted
atm: zatm: Fix empty body Clang warnings
Clang warns: drivers/atm/zatm.c:513:7: error: while loop has empty body [-Werror,-Wempty-body] zwait; ^ drivers/atm/zatm.c:513:7: note: put the semicolon on a separate line to silence this warning Get rid of this warning by using an empty do-while loop. While we're at it, add parentheses to make it clear that this is a function-like macro. Link: ClangBuiltLinux/linux#42 Suggested-by: Masahiro Yamada <[email protected]> Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 3e73cc5 commit 64b9d16

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

drivers/atm/zatm.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static unsigned long dummy[2] = {0,0};
126126
#define zin_n(r) inl(zatm_dev->base+r*4)
127127
#define zin(r) inl(zatm_dev->base+uPD98401_##r*4)
128128
#define zout(v,r) outl(v,zatm_dev->base+uPD98401_##r*4)
129-
#define zwait while (zin(CMR) & uPD98401_BUSY)
129+
#define zwait() do {} while (zin(CMR) & uPD98401_BUSY)
130130

131131
/* RX0, RX1, TX0, TX1 */
132132
static const int mbx_entries[NR_MBX] = { 1024,1024,1024,1024 };
@@ -140,7 +140,7 @@ static const int mbx_esize[NR_MBX] = { 16,16,4,4 }; /* entry size in bytes */
140140

141141
static void zpokel(struct zatm_dev *zatm_dev,u32 value,u32 addr)
142142
{
143-
zwait;
143+
zwait();
144144
zout(value,CER);
145145
zout(uPD98401_IND_ACC | uPD98401_IA_BALL |
146146
(uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR);
@@ -149,10 +149,10 @@ static void zpokel(struct zatm_dev *zatm_dev,u32 value,u32 addr)
149149

150150
static u32 zpeekl(struct zatm_dev *zatm_dev,u32 addr)
151151
{
152-
zwait;
152+
zwait();
153153
zout(uPD98401_IND_ACC | uPD98401_IA_BALL | uPD98401_IA_RW |
154154
(uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR);
155-
zwait;
155+
zwait();
156156
return zin(CER);
157157
}
158158

@@ -241,7 +241,7 @@ static void refill_pool(struct atm_dev *dev,int pool)
241241
}
242242
if (first) {
243243
spin_lock_irqsave(&zatm_dev->lock, flags);
244-
zwait;
244+
zwait();
245245
zout(virt_to_bus(first),CER);
246246
zout(uPD98401_ADD_BAT | (pool << uPD98401_POOL_SHIFT) | count,
247247
CMR);
@@ -508,9 +508,9 @@ static int open_rx_first(struct atm_vcc *vcc)
508508
}
509509
if (zatm_vcc->pool < 0) return -EMSGSIZE;
510510
spin_lock_irqsave(&zatm_dev->lock, flags);
511-
zwait;
511+
zwait();
512512
zout(uPD98401_OPEN_CHAN,CMR);
513-
zwait;
513+
zwait();
514514
DPRINTK("0x%x 0x%x\n",zin(CMR),zin(CER));
515515
chan = (zin(CMR) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;
516516
spin_unlock_irqrestore(&zatm_dev->lock, flags);
@@ -571,21 +571,21 @@ static void close_rx(struct atm_vcc *vcc)
571571
pos = vcc->vci >> 1;
572572
shift = (1-(vcc->vci & 1)) << 4;
573573
zpokel(zatm_dev,zpeekl(zatm_dev,pos) & ~(0xffff << shift),pos);
574-
zwait;
574+
zwait();
575575
zout(uPD98401_NOP,CMR);
576-
zwait;
576+
zwait();
577577
zout(uPD98401_NOP,CMR);
578578
spin_unlock_irqrestore(&zatm_dev->lock, flags);
579579
}
580580
spin_lock_irqsave(&zatm_dev->lock, flags);
581-
zwait;
581+
zwait();
582582
zout(uPD98401_DEACT_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan <<
583583
uPD98401_CHAN_ADDR_SHIFT),CMR);
584-
zwait;
584+
zwait();
585585
udelay(10); /* why oh why ... ? */
586586
zout(uPD98401_CLOSE_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan <<
587587
uPD98401_CHAN_ADDR_SHIFT),CMR);
588-
zwait;
588+
zwait();
589589
if (!(zin(CMR) & uPD98401_CHAN_ADDR))
590590
printk(KERN_CRIT DEV_LABEL "(itf %d): can't close RX channel "
591591
"%d\n",vcc->dev->number,zatm_vcc->rx_chan);
@@ -699,7 +699,7 @@ printk("NONONONOO!!!!\n");
699699
skb_queue_tail(&zatm_vcc->tx_queue,skb);
700700
DPRINTK("QRP=0x%08lx\n",zpeekl(zatm_dev,zatm_vcc->tx_chan*VC_SIZE/4+
701701
uPD98401_TXVC_QRP));
702-
zwait;
702+
zwait();
703703
zout(uPD98401_TX_READY | (zatm_vcc->tx_chan <<
704704
uPD98401_CHAN_ADDR_SHIFT),CMR);
705705
spin_unlock_irqrestore(&zatm_dev->lock, flags);
@@ -891,12 +891,12 @@ static void close_tx(struct atm_vcc *vcc)
891891
}
892892
spin_lock_irqsave(&zatm_dev->lock, flags);
893893
#if 0
894-
zwait;
894+
zwait();
895895
zout(uPD98401_DEACT_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR);
896896
#endif
897-
zwait;
897+
zwait();
898898
zout(uPD98401_CLOSE_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR);
899-
zwait;
899+
zwait();
900900
if (!(zin(CMR) & uPD98401_CHAN_ADDR))
901901
printk(KERN_CRIT DEV_LABEL "(itf %d): can't close TX channel "
902902
"%d\n",vcc->dev->number,chan);
@@ -926,9 +926,9 @@ static int open_tx_first(struct atm_vcc *vcc)
926926
zatm_vcc->tx_chan = 0;
927927
if (vcc->qos.txtp.traffic_class == ATM_NONE) return 0;
928928
spin_lock_irqsave(&zatm_dev->lock, flags);
929-
zwait;
929+
zwait();
930930
zout(uPD98401_OPEN_CHAN,CMR);
931-
zwait;
931+
zwait();
932932
DPRINTK("0x%x 0x%x\n",zin(CMR),zin(CER));
933933
chan = (zin(CMR) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;
934934
spin_unlock_irqrestore(&zatm_dev->lock, flags);
@@ -1557,7 +1557,7 @@ static void zatm_phy_put(struct atm_dev *dev,unsigned char value,
15571557
struct zatm_dev *zatm_dev;
15581558

15591559
zatm_dev = ZATM_DEV(dev);
1560-
zwait;
1560+
zwait();
15611561
zout(value,CER);
15621562
zout(uPD98401_IND_ACC | uPD98401_IA_B0 |
15631563
(uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR);
@@ -1569,10 +1569,10 @@ static unsigned char zatm_phy_get(struct atm_dev *dev,unsigned long addr)
15691569
struct zatm_dev *zatm_dev;
15701570

15711571
zatm_dev = ZATM_DEV(dev);
1572-
zwait;
1572+
zwait();
15731573
zout(uPD98401_IND_ACC | uPD98401_IA_B0 | uPD98401_IA_RW |
15741574
(uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR);
1575-
zwait;
1575+
zwait();
15761576
return zin(CER) & 0xff;
15771577
}
15781578

0 commit comments

Comments
 (0)