Commit 6c2797cd authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Vasily Gorbik
Browse files

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



Commit c1e18c17 ("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: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 2268169c

arch/s390/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -283,9 +283,6 @@ int zpci_dma_exit_device(struct zpci_dev *zdev); 
int __init zpci_irq_init(void);

void __init zpci_irq_exit(void);



int zpci_set_irq(struct zpci_dev *zdev);

int zpci_clear_irq(struct zpci_dev *zdev);



/* FMB */

int zpci_fmb_enable_device(struct zpci_dev *);

int zpci_fmb_disable_device(struct zpci_dev *);

arch/s390/pci/pci_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int zpci_clear_directed_irq(struct zpci_dev *zdev) 
}



/* Register adapter interruptions */

int zpci_set_irq(struct zpci_dev *zdev)

static int zpci_set_irq(struct zpci_dev *zdev)

{

	int rc;
@@ -115,7 +115,7 @@ int zpci_set_irq(struct zpci_dev *zdev) 
}



/* Clear adapter interruptions */

int zpci_clear_irq(struct zpci_dev *zdev)

static int zpci_clear_irq(struct zpci_dev *zdev)

{

	int rc;