summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/hisax.h
diff options
context:
space:
mode:
authorNathan Chancellor2018-10-19 03:11:04 +0200
committerDavid S. Miller2018-10-23 04:24:48 +0200
commita1930a9877d66e9333fc1b1ceeec1ab54591a91f (patch)
treea2f4748b17398adc57f3268cb9d48bb9af956857 /drivers/isdn/hisax/hisax.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff)
downloadkernel-qcow2-linux-a1930a9877d66e9333fc1b1ceeec1ab54591a91f.tar.gz
kernel-qcow2-linux-a1930a9877d66e9333fc1b1ceeec1ab54591a91f.tar.xz
kernel-qcow2-linux-a1930a9877d66e9333fc1b1ceeec1ab54591a91f.zip
isdn: hfc_{pci,sx}: Avoid empty body if statements
Clang warns: drivers/isdn/hisax/hfc_pci.c:131:34: error: if statement has empty body [-Werror,-Wempty-body] if (Read_hfc(cs, HFCPCI_INT_S1)); ^ drivers/isdn/hisax/hfc_pci.c:131:34: note: put the semicolon on a separate line to silence this warning In my attempt to hide the warnings because I thought they didn't serve any purpose[1], Masahiro Yamada pointed out that {Read,Write}_hfc in hci_pci.c should be using a standard register access method; otherwise, the compiler will just remove the if statements. For hfc_pci, use the versions of {Read,Write}_hfc found in drivers/isdn/hardware/mISDN/hfc_pCI.h while converting pci_io to be 'void __iomem *' (and clean up ioremap) then remove the empty if statements. For hfc_sx, {Read,Write}_hfc are already use a proper register accessor (inb, outb) so just remove the unnecessary if statements. [1]: https://lore.kernel.org/lkml/20181016021454.11953-1-natechancellor@gmail.com/ Link: https://github.com/ClangBuiltLinux/linux/issues/66 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>
Diffstat (limited to 'drivers/isdn/hisax/hisax.h')
-rw-r--r--drivers/isdn/hisax/hisax.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 338d0408b377..40080e06421c 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -703,7 +703,7 @@ struct hfcPCI_hw {
unsigned char nt_mode;
int nt_timer;
struct pci_dev *dev;
- unsigned char *pci_io; /* start of PCI IO memory */
+ void __iomem *pci_io; /* start of PCI IO memory */
dma_addr_t dma; /* dma handle for Fifos */
void *fifos; /* FIFO memory */
int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */