Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: https://github.com/ClangBuiltLinux/linux/issues/42
Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Nathan Chancellor and committed by
David S. Miller
64b9d16e 3e73cc5c

+21 -21
+21 -21
drivers/atm/zatm.c
··· 126 126 #define zin_n(r) inl(zatm_dev->base+r*4) 127 127 #define zin(r) inl(zatm_dev->base+uPD98401_##r*4) 128 128 #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) 130 130 131 131 /* RX0, RX1, TX0, TX1 */ 132 132 static const int mbx_entries[NR_MBX] = { 1024,1024,1024,1024 }; ··· 140 140 141 141 static void zpokel(struct zatm_dev *zatm_dev,u32 value,u32 addr) 142 142 { 143 - zwait; 143 + zwait(); 144 144 zout(value,CER); 145 145 zout(uPD98401_IND_ACC | uPD98401_IA_BALL | 146 146 (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR); ··· 149 149 150 150 static u32 zpeekl(struct zatm_dev *zatm_dev,u32 addr) 151 151 { 152 - zwait; 152 + zwait(); 153 153 zout(uPD98401_IND_ACC | uPD98401_IA_BALL | uPD98401_IA_RW | 154 154 (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR); 155 - zwait; 155 + zwait(); 156 156 return zin(CER); 157 157 } 158 158 ··· 241 241 } 242 242 if (first) { 243 243 spin_lock_irqsave(&zatm_dev->lock, flags); 244 - zwait; 244 + zwait(); 245 245 zout(virt_to_bus(first),CER); 246 246 zout(uPD98401_ADD_BAT | (pool << uPD98401_POOL_SHIFT) | count, 247 247 CMR); ··· 508 508 } 509 509 if (zatm_vcc->pool < 0) return -EMSGSIZE; 510 510 spin_lock_irqsave(&zatm_dev->lock, flags); 511 - zwait; 511 + zwait(); 512 512 zout(uPD98401_OPEN_CHAN,CMR); 513 - zwait; 513 + zwait(); 514 514 DPRINTK("0x%x 0x%x\n",zin(CMR),zin(CER)); 515 515 chan = (zin(CMR) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT; 516 516 spin_unlock_irqrestore(&zatm_dev->lock, flags); ··· 571 571 pos = vcc->vci >> 1; 572 572 shift = (1-(vcc->vci & 1)) << 4; 573 573 zpokel(zatm_dev,zpeekl(zatm_dev,pos) & ~(0xffff << shift),pos); 574 - zwait; 574 + zwait(); 575 575 zout(uPD98401_NOP,CMR); 576 - zwait; 576 + zwait(); 577 577 zout(uPD98401_NOP,CMR); 578 578 spin_unlock_irqrestore(&zatm_dev->lock, flags); 579 579 } 580 580 spin_lock_irqsave(&zatm_dev->lock, flags); 581 - zwait; 581 + zwait(); 582 582 zout(uPD98401_DEACT_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << 583 583 uPD98401_CHAN_ADDR_SHIFT),CMR); 584 - zwait; 584 + zwait(); 585 585 udelay(10); /* why oh why ... ? */ 586 586 zout(uPD98401_CLOSE_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << 587 587 uPD98401_CHAN_ADDR_SHIFT),CMR); 588 - zwait; 588 + zwait(); 589 589 if (!(zin(CMR) & uPD98401_CHAN_ADDR)) 590 590 printk(KERN_CRIT DEV_LABEL "(itf %d): can't close RX channel " 591 591 "%d\n",vcc->dev->number,zatm_vcc->rx_chan); ··· 699 699 skb_queue_tail(&zatm_vcc->tx_queue,skb); 700 700 DPRINTK("QRP=0x%08lx\n",zpeekl(zatm_dev,zatm_vcc->tx_chan*VC_SIZE/4+ 701 701 uPD98401_TXVC_QRP)); 702 - zwait; 702 + zwait(); 703 703 zout(uPD98401_TX_READY | (zatm_vcc->tx_chan << 704 704 uPD98401_CHAN_ADDR_SHIFT),CMR); 705 705 spin_unlock_irqrestore(&zatm_dev->lock, flags); ··· 891 891 } 892 892 spin_lock_irqsave(&zatm_dev->lock, flags); 893 893 #if 0 894 - zwait; 894 + zwait(); 895 895 zout(uPD98401_DEACT_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR); 896 896 #endif 897 - zwait; 897 + zwait(); 898 898 zout(uPD98401_CLOSE_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR); 899 - zwait; 899 + zwait(); 900 900 if (!(zin(CMR) & uPD98401_CHAN_ADDR)) 901 901 printk(KERN_CRIT DEV_LABEL "(itf %d): can't close TX channel " 902 902 "%d\n",vcc->dev->number,chan); ··· 926 926 zatm_vcc->tx_chan = 0; 927 927 if (vcc->qos.txtp.traffic_class == ATM_NONE) return 0; 928 928 spin_lock_irqsave(&zatm_dev->lock, flags); 929 - zwait; 929 + zwait(); 930 930 zout(uPD98401_OPEN_CHAN,CMR); 931 - zwait; 931 + zwait(); 932 932 DPRINTK("0x%x 0x%x\n",zin(CMR),zin(CER)); 933 933 chan = (zin(CMR) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT; 934 934 spin_unlock_irqrestore(&zatm_dev->lock, flags); ··· 1557 1557 struct zatm_dev *zatm_dev; 1558 1558 1559 1559 zatm_dev = ZATM_DEV(dev); 1560 - zwait; 1560 + zwait(); 1561 1561 zout(value,CER); 1562 1562 zout(uPD98401_IND_ACC | uPD98401_IA_B0 | 1563 1563 (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR); ··· 1569 1569 struct zatm_dev *zatm_dev; 1570 1570 1571 1571 zatm_dev = ZATM_DEV(dev); 1572 - zwait; 1572 + zwait(); 1573 1573 zout(uPD98401_IND_ACC | uPD98401_IA_B0 | uPD98401_IA_RW | 1574 1574 (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR); 1575 - zwait; 1575 + zwait(); 1576 1576 return zin(CER) & 0xff; 1577 1577 } 1578 1578