Skip to content

Commit

Permalink
MSI: Remove pci_scan_msi_device()
Browse files Browse the repository at this point in the history
pci_scan_msi_device() doesn't do anything anymore, so remove it.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Michael Ellerman authored and Greg Kroah-Hartman committed Feb 7, 2007
1 parent 88187df commit 0fcfdab
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 11 deletions.
2 changes: 0 additions & 2 deletions arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 0 additions & 6 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -625,15 +625,13 @@ 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,
struct msix_entry *entries, int nvec) {return -1;}
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,
Expand Down

0 comments on commit 0fcfdab

Please sign in to comment.