From rientjes@cs.washington.edu Sun Dec 3 11:55:43 2006 Date: Sun, 3 Dec 2006 11:55:34 -0800 (PST) From: David Rientjes To: Martin Mares , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org Subject: PCI quirks: remove redundant check Message-ID: Removes redundant check for dev->subordinate; if it is NULL, the function returns before the patch-affected code region. Signed-off-by: David Rientjes Acked-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman --- drivers/pci/quirks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c @@ -1688,8 +1688,7 @@ static void __devinit quirk_nvidia_ck804 * a single one having MSI is enough to be sure that MSI are supported. */ pdev = pci_get_slot(dev->bus, 0); - if (dev->subordinate && !msi_ht_cap_enabled(dev) - && !msi_ht_cap_enabled(pdev)) { + if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) { printk(KERN_WARNING "PCI: MSI quirk detected. " "MSI disabled on chipset %s.\n", pci_name(dev));