Commit 0fcfdabb authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

MSI: Remove pci_scan_msi_device() 



pci_scan_msi_device() doesn't do anything anymore, so remove it.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 88187dfa

arch/powerpc/kernel/pci_64.c

+0 −2
Original line number Diff line number Diff line
@@ -381,8 +381,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 


	pci_device_add(dev, bus);



	/* XXX pci_scan_msi_device(dev); */



	return dev;

}

EXPORT_SYMBOL(of_create_pci_dev);

drivers/pci/msi.c

+0 −6
Original line number Diff line number Diff line
@@ -294,12 +294,6 @@ static int msi_lookup_irq(struct pci_dev *dev, int type) 
	return -EACCES;

}



void pci_scan_msi_device(struct pci_dev *dev)

{

	if (!dev)

		return;

}



#ifdef CONFIG_PM

int pci_save_msi_state(struct pci_dev *dev)

{

drivers/pci/probe.c

+0 −1
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ pci_scan_single_device(struct pci_bus *bus, int devfn) 
		return NULL;



	pci_device_add(dev, bus);

	pci_scan_msi_device(dev);



	return dev;

}

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -625,7 +625,6 @@ struct msix_entry { 




#ifndef CONFIG_PCI_MSI

static inline void pci_scan_msi_device(struct pci_dev *dev) {}

static inline int pci_enable_msi(struct pci_dev *dev) {return -1;}

static inline void pci_disable_msi(struct pci_dev *dev) {}

static inline int pci_enable_msix(struct pci_dev* dev,
@@ -633,7 +632,6 @@ static inline int pci_enable_msix(struct pci_dev* dev, 
static inline void pci_disable_msix(struct pci_dev *dev) {}

static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}

#else

extern void pci_scan_msi_device(struct pci_dev *dev);

extern int pci_enable_msi(struct pci_dev *dev);

extern void pci_disable_msi(struct pci_dev *dev);

extern int pci_enable_msix(struct pci_dev* dev,