Skip to content

Commit 6c2797c

Browse files
niklas88Vasily Gorbik
authored andcommitted
s390/pci: make zpci_set_irq()/zpci_clear_irq() static
Commit c1e18c1 ("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>
1 parent 2268169 commit 6c2797c

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

arch/s390/include/asm/pci.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@ int zpci_dma_exit_device(struct zpci_dev *zdev);
283283
int __init zpci_irq_init(void);
284284
void __init zpci_irq_exit(void);
285285

286-
int zpci_set_irq(struct zpci_dev *zdev);
287-
int zpci_clear_irq(struct zpci_dev *zdev);
288-
289286
/* FMB */
290287
int zpci_fmb_enable_device(struct zpci_dev *);
291288
int zpci_fmb_disable_device(struct zpci_dev *);

arch/s390/pci/pci_irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static int zpci_clear_directed_irq(struct zpci_dev *zdev)
9999
}
100100

101101
/* Register adapter interruptions */
102-
int zpci_set_irq(struct zpci_dev *zdev)
102+
static int zpci_set_irq(struct zpci_dev *zdev)
103103
{
104104
int rc;
105105

@@ -115,7 +115,7 @@ int zpci_set_irq(struct zpci_dev *zdev)
115115
}
116116

117117
/* Clear adapter interruptions */
118-
int zpci_clear_irq(struct zpci_dev *zdev)
118+
static int zpci_clear_irq(struct zpci_dev *zdev)
119119
{
120120
int rc;
121121

0 commit comments

Comments
 (0)