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

s390/pci: make zpci_set_irq()/zpci_clear_irq() static

Commit c1e18c17bda68 ("s390/pci: add zpci_set_irq()/zpci_clear_irq()")
made zpci_set_irq()/zpci_clear_irq() non-static in preparation for using
them in zpci_hot_reset_device(). The version of zpci_hot_reset_device()
that was finally merged however exploits the fact that IRQs and DMA is
implicitly disabled by clp_disable_fh() so the call to zpci_clear_irq()
was never added. There are no other calls outside pci_irq.c so lets make
both functions static.

Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

authored by

Niklas Schnelle and committed by
Vasily Gorbik
6c2797cd 2268169c

+2 -5
-3
arch/s390/include/asm/pci.h
··· 283 283 int __init zpci_irq_init(void); 284 284 void __init zpci_irq_exit(void); 285 285 286 - int zpci_set_irq(struct zpci_dev *zdev); 287 - int zpci_clear_irq(struct zpci_dev *zdev); 288 - 289 286 /* FMB */ 290 287 int zpci_fmb_enable_device(struct zpci_dev *); 291 288 int zpci_fmb_disable_device(struct zpci_dev *);
+2 -2
arch/s390/pci/pci_irq.c
··· 99 99 } 100 100 101 101 /* Register adapter interruptions */ 102 - int zpci_set_irq(struct zpci_dev *zdev) 102 + static int zpci_set_irq(struct zpci_dev *zdev) 103 103 { 104 104 int rc; 105 105 ··· 115 115 } 116 116 117 117 /* Clear adapter interruptions */ 118 - int zpci_clear_irq(struct zpci_dev *zdev) 118 + static int zpci_clear_irq(struct zpci_dev *zdev) 119 119 { 120 120 int rc; 121 121