Skip to content

Commit

Permalink
PCI MSI: Remove attribute check from pci_disable_msi()
Browse files Browse the repository at this point in the history
The msi_list never have MSI-X's msi_desc while MSI is enabled,
and also it never have MSI's msi_desc while MSI-X is enabled.

This patch remove check for MSI-X entry from the pci_disable_msi(),
referring that pci_disable_msix() does not have any check for MSI
entry.

Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Hidetoshi Seto authored and Jesse Barnes committed Sep 9, 2009
1 parent 8028687 commit c901851
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,17 +640,10 @@ void pci_msi_shutdown(struct pci_dev *dev)

void pci_disable_msi(struct pci_dev* dev)
{
struct msi_desc *entry;

if (!pci_msi_enable || !dev || !dev->msi_enabled)
return;

pci_msi_shutdown(dev);

entry = list_entry(dev->msi_list.next, struct msi_desc, list);
if (entry->msi_attrib.is_msix)
return;

msi_free_irqs(dev);
}
EXPORT_SYMBOL(pci_disable_msi);
Expand Down Expand Up @@ -774,13 +767,13 @@ void pci_msix_shutdown(struct pci_dev* dev)
pci_intx_for_msi(dev, 1);
dev->msix_enabled = 0;
}

void pci_disable_msix(struct pci_dev* dev)
{
if (!pci_msi_enable || !dev || !dev->msix_enabled)
return;

pci_msix_shutdown(dev);

msix_free_all_irqs(dev);
}
EXPORT_SYMBOL(pci_disable_msix);
Expand Down

0 comments on commit c901851

Please sign in to comment.