evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: remove redundant checking in PCI Express capability routines

Browse source 
There are a number of redundant pci_is_pcie() checks in various PCI
Express capabilities related routines like the following:

    if (!pci_is_pcie(dev))
	return false;

    pos = pci_pcie_cap(dev);
    if (!pos)
	return false;

The current pci_is_pcie() implementation is merely:

    static inline bool pci_is_pcie(struct pci_dev *dev)
    {
        return !!pci_pcie_cap(dev);
    }

so we can just drop the pci_is_pcie() test in such cases.

Acked-by: Donald Dutile <ddutile@redhat.com>
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Myron Stowe 2012-06-01 15:16:31 -06:00 • committed by Bjorn Helgaas
parent c32823f82b
commit cb97ae3485
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/pci/pci.c
View file

@ -1994,7 +1994,7 @@ void pci_enable_ari(struct pci_dev *dev)
return; return;
bridge = dev->bus->self; bridge = dev->bus->self;
if (!bridge || !pci_is_pcie(bridge)) if (!bridge)
return; return;
pos = pci_pcie_cap(bridge); pos = pci_pcie_cap(bridge);
@ -2054,9 +2054,6 @@ void pci_disable_ido(struct pci_dev *dev, unsigned long type)
int pos; int pos;
u16 ctrl; u16 ctrl;
if (!pci_is_pcie(dev))
return;
pos = pci_pcie_cap(dev); pos = pci_pcie_cap(dev);
if (!pos) if (!pos)
return; return;
@ -2096,9 +2093,6 @@ int pci_enable_obff(struct pci_dev *dev, enum pci_obff_signal_type type)
u16 ctrl; u16 ctrl;
int ret; int ret;
if (!pci_is_pcie(dev))
return -ENOTSUPP;
pos = pci_pcie_cap(dev); pos = pci_pcie_cap(dev);
if (!pos) if (!pos)
return -ENOTSUPP; return -ENOTSUPP;
@ -2149,9 +2143,6 @@ void pci_disable_obff(struct pci_dev *dev)
int pos; int pos;
u16 ctrl; u16 ctrl;
if (!pci_is_pcie(dev))
return;
pos = pci_pcie_cap(dev); pos = pci_pcie_cap(dev);
if (!pos) if (!pos)
return; return;
@ -2174,9 +2165,6 @@ static bool pci_ltr_supported(struct pci_dev *dev)
int pos; int pos;
u32 cap; u32 cap;
if (!pci_is_pcie(dev))
return false;
pos = pci_pcie_cap(dev); pos = pci_pcie_cap(dev);
if (!pos) if (!pos)
return false; return false;