Commit 4c170ed1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pnp' and 'pnp' 

* acpi-pnp:
  ACPI / PNP: constify device IDs

* pnp:
  PNP: respect PNP_DRIVER_RES_DO_NOT_CHANGE when detaching
  PNP: Add Broadwell to Intel MCH size workaround
parents 476cc433 38a234b9 e0f03e87

drivers/acpi/acpi_pnp.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static struct acpi_scan_handler acpi_pnp_handler = { 
 */

static int is_cmos_rtc_device(struct acpi_device *adev)

{

	struct acpi_device_id ids[] = {

	static const struct acpi_device_id ids[] = {

		{ "PNP0B00" },

		{ "PNP0B01" },

		{ "PNP0B02" },

drivers/pnp/driver.c

+5 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ void pnp_device_detach(struct pnp_dev *pnp_dev) 
	if (pnp_dev->status == PNP_ATTACHED)

		pnp_dev->status = PNP_READY;

	mutex_unlock(&pnp_lock);

	pnp_disable_dev(pnp_dev);

}



static int pnp_device_probe(struct device *dev)
@@ -131,6 +130,11 @@ static int pnp_device_remove(struct device *dev) 
			drv->remove(pnp_dev);

		pnp_dev->driver = NULL;

	}



	if (pnp_dev->active &&

	    (!drv || !(drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)))

		pnp_disable_dev(pnp_dev);



	pnp_device_detach(pnp_dev);

	return 0;

}

drivers/pnp/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev) 
static const unsigned int mch_quirk_devices[] = {

	0x0154,	/* Ivy Bridge */

	0x0c00,	/* Haswell */

	0x1604, /* Broadwell */

};



static struct pci_dev *get_intel_host(void)