- pci-quirks-remove-redundant-check.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     pci quirks: remove redundant check
has been removed from the -mm tree.  Its filename was
     pci-quirks-remove-redundant-check.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: pci quirks: remove redundant check
From: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>

Removes redundant check for dev->subordinate; if it is NULL, the function
returns before the patch-affected code region.

Cc: Martin Mares <mj@xxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/pci/quirks.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/pci/quirks.c~pci-quirks-remove-redundant-check drivers/pci/quirks.c
--- a/drivers/pci/quirks.c~pci-quirks-remove-redundant-check
+++ a/drivers/pci/quirks.c
@@ -1741,8 +1741,7 @@ static void __devinit quirk_nvidia_ck804
 	pdev = pci_get_slot(dev->bus, 0);
 	if (!pdev)
 		return;
-	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));
_

Patches currently in -mm which might be from rientjes@xxxxxxxxxxxxxxxxx are

origin.patch
video-sis-remove-unnecessary-variables-in-sis_ddc2delay.patch
hrtimers-clean-up-locking-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux