mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 17:36:40 +07:00
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
This commit is contained in:
commit
4c170ed1d9
@ -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" },
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user