2006-12-03 19:55:45

by David Rientjes

Subject: [PATCH] pci quirks: remove redundant check

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

Cc: Martin Mares <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: David Rientjes <[email protected]>
---
drivers/pci/quirks.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9ca9b9b..7571863 100644
--- a/drivers/pci/quirks.c
+++ b/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));

2006-12-05 10:49:56

by Brice Goglin

Subject: Re: [PATCH] pci quirks: remove redundant check

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

ACK, looks like I forgot to remove it when copy-pasting the quirk right
above it.

Brice



> Cc: Martin Mares <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: David Rientjes <[email protected]>
> ---
> drivers/pci/quirks.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 9ca9b9b..7571863 100644
> --- a/drivers/pci/quirks.c
> +++ b/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));
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>