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

Commit 6e315544 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:
  PNP: Add missing casts in printk() arguments
  PCI: docking station: remove dock uevents
  PCI: Unhide the SMBus on Asus PU-DLS
  PCI Hotplug: add acpiphp to MAINTAINERS
  PCI: pci/search: EXPORTs cannot be __devinit
  PCIE: cleanup on probe error
  pcie: fix warnings when CONFIG_PM=n
parents c31ca59e 2131ca89

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/ 
T:	git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git

S:	Maintained



ACPI PCI HOTPLUG DRIVER

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

L:	pcihpd-discuss@lists.sourceforge.net

S:	Maintained



AD1816 SOUND DRIVER

P:	Thorsten Knabe

M:	Thorsten Knabe <linux@thorsten-knabe.de>

drivers/acpi/dock.c

+6 −7
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ struct dock_dependent_device { 
};



#define DOCK_DOCKING	0x00000001

#define DOCK_EVENT	KOBJ_DOCK

#define UNDOCK_EVENT	KOBJ_UNDOCK

#define DOCK_EVENT	3

#define UNDOCK_EVENT	2



static struct dock_station *dock_station;
@@ -322,11 +322,10 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event) 


static void dock_event(struct dock_station *ds, u32 event, int num)

{

	struct acpi_device *device;



	device = dock_create_acpi_device(ds->handle);

	if (device)

		kobject_uevent(&device->kobj, num);

	/*

	 * we don't do events until someone tells me that

	 * they would like to have them.

	 */

}



/**

drivers/pci/hotplug/acpiphp_core.c

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 * Send feedback to <gregkh@us.ibm.com>,

 *		    <t-kochi@bq.jp.nec.com>

 * Send feedback to <kristen.c.accardi@intel.com>

 *

 */

drivers/pci/hotplug/acpiphp_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 * Send feedback to <t-kochi@bq.jp.nec.com>

 * Send feedback to <kristen.c.accardi@intel.com>

 *

 */

drivers/pci/pcie/portdrv_pci.c

+20 −18
Original line number Diff line number Diff line
@@ -30,23 +30,6 @@ MODULE_LICENSE("GPL"); 
/* global data */

static const char device_name[] = "pcieport-driver";



static int pcie_portdrv_save_config(struct pci_dev *dev)

{

	return pci_save_state(dev);

}



static int pcie_portdrv_restore_config(struct pci_dev *dev)

{

	int retval;



	pci_restore_state(dev);

	retval = pci_enable_device(dev);

	if (retval)

		return retval;

	pci_set_master(dev);

	return 0;

}



/*

 * pcie_portdrv_probe - Probe PCI-Express port devices

 * @dev: PCI-Express port device being probed
@@ -73,8 +56,10 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev, 
		"%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", 

		__FUNCTION__, dev->device, dev->vendor);

	}

	if (pcie_port_device_register(dev)) 

	if (pcie_port_device_register(dev)) {

		pci_disable_device(dev);

		return -ENOMEM;

	}



	return 0;

}
@@ -86,6 +71,23 @@ static void pcie_portdrv_remove (struct pci_dev *dev) 
}



#ifdef CONFIG_PM

static int pcie_portdrv_save_config(struct pci_dev *dev)

{

	return pci_save_state(dev);

}



static int pcie_portdrv_restore_config(struct pci_dev *dev)

{

	int retval;



	pci_restore_state(dev);

	retval = pci_enable_device(dev);

	if (retval)

		return retval;

	pci_set_master(dev);

	return 0;

}



static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)

{

	int ret = pcie_port_device_suspend(dev, state);