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

Merge branch 'pci/misc' into next

Browse source 
* pci/misc:
  PCI / ACPI / PM: Use correct power state strings in messages
  PCI: Fix comment typo for pcie_pme_remove()
  PCI: Add pcibios_release_device()
This commit is contained in:
Bjorn Helgaas 2013-06-14 17:08:48 -06:00
commit 726246d2e6
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/pci/pci-acpi.c
View file

@ -186,8 +186,8 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
[PCI_D0] = ACPI_STATE_D0, [PCI_D0] = ACPI_STATE_D0,
[PCI_D1] = ACPI_STATE_D1, [PCI_D1] = ACPI_STATE_D1,
[PCI_D2] = ACPI_STATE_D2, [PCI_D2] = ACPI_STATE_D2,
[PCI_D3hot] = ACPI_STATE_D3, [PCI_D3hot] = ACPI_STATE_D3_COLD,
[PCI_D3cold] = ACPI_STATE_D3 [PCI_D3cold] = ACPI_STATE_D3_COLD,
}; };
int error = -EINVAL; int error = -EINVAL;
@ -211,7 +211,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
if (!error) if (!error)
dev_info(&dev->dev, "power state changed by ACPI to %s\n", dev_info(&dev->dev, "power state changed by ACPI to %s\n",
pci_power_name(state)); acpi_power_state_string(state_conv[state]));
return error; return error;
} }

10
drivers/pci/pci.c
View file

@ -1334,6 +1334,16 @@ int __weak pcibios_add_device (struct pci_dev *dev)
return 0; return 0;
} }
/**
* pcibios_release_device - provide arch specific hooks when releasing device dev
* @dev: the PCI device being released
*
* Permits the platform to provide architecture specific functionality when
* devices are released. This is the default implementation. Architecture
* implementations can override this.
*/
void __weak pcibios_release_device(struct pci_dev *dev) {}
/** /**
* pcibios_disable_device - disable arch specific PCI resources for device dev * pcibios_disable_device - disable arch specific PCI resources for device dev
* @dev: the PCI device to disable * @dev: the PCI device to disable

2
drivers/pci/pcie/pme.c
View file

@ -408,7 +408,7 @@ static int pcie_pme_resume(struct pcie_device *srv)
/** /**
* pcie_pme_remove - Prepare PCIe PME service device for removal. * pcie_pme_remove - Prepare PCIe PME service device for removal.
* @srv - PCIe service device to resume. * @srv - PCIe service device to remove.
*/ */
static void pcie_pme_remove(struct pcie_device *srv) static void pcie_pme_remove(struct pcie_device *srv)
{ {

1
drivers/pci/probe.c
View file

@ -1151,6 +1151,7 @@ static void pci_release_dev(struct device *dev)
pci_dev = to_pci_dev(dev); pci_dev = to_pci_dev(dev);
pci_release_capabilities(pci_dev); pci_release_capabilities(pci_dev);
pci_release_of_node(pci_dev); pci_release_of_node(pci_dev);
pcibios_release_device(pci_dev);
kfree(pci_dev); kfree(pci_dev);
} }

1
include/linux/pci.h
View file

@ -1643,6 +1643,7 @@ void pcibios_set_master(struct pci_dev *dev);
int pcibios_set_pcie_reset_state(struct pci_dev *dev, int pcibios_set_pcie_reset_state(struct pci_dev *dev,
enum pcie_reset_state state); enum pcie_reset_state state);
int pcibios_add_device(struct pci_dev *dev); int pcibios_add_device(struct pci_dev *dev);
void pcibios_release_device(struct pci_dev *dev);
#ifdef CONFIG_PCI_MMCONFIG #ifdef CONFIG_PCI_MMCONFIG
void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_early_init(void);