Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cf76691 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix 4x section mismatch warnings
  PCI: fix section mismatch warnings referring to pci_do_scan_bus
  pci: pci_enable_device_bars() fix for lpfc driver
  Revert "PCI: PCIE ASPM support"
parents 9135f190 451124a7

drivers/pci/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o 


# Build the PCI Hotplug drivers if we were asked to

obj-$(CONFIG_HOTPLUG_PCI) += hotplug/

ifdef CONFIG_HOTPLUG_PCI

obj-y += hotplug-pci.o

endif



# Build the PCI MSI interrupt support

obj-$(CONFIG_PCI_MSI) += msi.o

drivers/pci/hotplug-pci.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* Core PCI functionality used only by PCI hotplug */



#include <linux/pci.h>

#include "pci.h"





unsigned int pci_do_scan_bus(struct pci_bus *bus)

{

	unsigned int max;



	max = pci_scan_child_bus(bus);



	/*

	 * Make the discovered devices available.

	 */

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL(pci_do_scan_bus);

drivers/pci/pci-sysfs.c

+0 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/topology.h>

#include <linux/mm.h>

#include <linux/capability.h>

#include <linux/aspm.h>

#include "pci.h"



static int sysfs_initialized;	/* = 0 */
@@ -651,8 +650,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) 
	if (pcibios_add_platform_entries(pdev))

		goto err_rom_file;



	pcie_aspm_create_sysfs_dev_files(pdev);



	return 0;



err_rom_file:
@@ -682,8 +679,6 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) 
	if (!sysfs_initialized)

		return;



	pcie_aspm_remove_sysfs_dev_files(pdev);



	if (pdev->cfg_size < 4096)

		sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);

	else

drivers/pci/pci.c

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/spinlock.h>

#include <linux/string.h>

#include <linux/log2.h>

#include <linux/aspm.h>

#include <asm/dma.h>	/* isa_dma_bridge_buggy */

#include "pci.h"
@@ -520,9 +519,6 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
	if (need_restore)

		pci_restore_bars(dev);



	if (dev->bus->self)

		pcie_aspm_pm_state_change(dev->bus->self);



	return 0;

}

drivers/pci/pcie/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -26,23 +26,3 @@ config HOTPLUG_PCI_PCIE 
	  When in doubt, say N.



source "drivers/pci/pcie/aer/Kconfig"
 


#

# PCI Express ASPM

#

config PCIEASPM

	bool "PCI Express ASPM support(Experimental)"

	depends on PCI && EXPERIMENTAL

	default y

	help

	  This enables PCI Express ASPM (Active State Power Management) and

	  Clock Power Management. ASPM supports state L0/L0s/L1.



	  When in doubt, say N.

config PCIEASPM_DEBUG

	bool "Debug PCI Express ASPM"

	depends on PCIEASPM

	default n

	help

	  This enables PCI Express ASPM debug support. It will add per-device

	  interface to control ASPM.