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

Merge branches 'acpi-spcr', 'acpi-osi', 'acpi-bus', 'acpi-scan' and 'acpi-misc' 

* acpi-spcr:
  ACPI: SPCR: Workaround for APM X-Gene 8250 UART 32-alignment errata
  ACPI: SPCR: Use access width to determine mmio usage

* acpi-osi:
  ACPI / osi: Make local function acpi_osi_dmi_linux() static

* acpi-bus:
  ACPI / bus: handle ACPI hotplug schedule errors completely

* acpi-scan:
  ACPI / scan: Indicate to platform when hot remove returns busy

* acpi-misc:
  ACPI / DPTF: constify attribute_group structures
  ACPI / LPSS: constify attribute_group structures
  ACPI: BGRT: constify attribute_group structures
  ACPI / power: constify attribute_group structures
parents eceeae41 79a64832 5438bc57 9a4d8d60 d429e5c1 9e4de6a8

drivers/acpi/acpi_lpss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -576,7 +576,7 @@ static struct attribute *lpss_attrs[] = { 
	NULL,

	NULL,

};

};





static struct attribute_group lpss_attr_group = {

static const struct attribute_group lpss_attr_group = {

	.attrs = lpss_attrs,

	.attrs = lpss_attrs,

	.name = "lpss_ltr",

	.name = "lpss_ltr",

};

};

drivers/acpi/bgrt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ static struct bin_attribute *bgrt_bin_attributes[] = { 
	NULL,

	NULL,

};

};





static struct attribute_group bgrt_attribute_group = {

static const struct attribute_group bgrt_attribute_group = {

	.attrs = bgrt_attributes,

	.attrs = bgrt_attributes,

	.bin_attrs = bgrt_bin_attributes,

	.bin_attrs = bgrt_bin_attributes,

};

};

drivers/acpi/bus.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -409,12 +409,16 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
	    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))

	    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))

		driver->ops.notify(adev, type);

		driver->ops.notify(adev, type);





	if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))

	if (!hotplug_event) {

		acpi_bus_put_acpi_device(adev);

		return;

		return;

	}





	acpi_bus_put_acpi_device(adev);

	if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))

		return;

		return;





	acpi_bus_put_acpi_device(adev);



 err:

 err:

	acpi_evaluate_ost(handle, type, ost_code, NULL);

	acpi_evaluate_ost(handle, type, ost_code, NULL);

}

}

drivers/acpi/dptf/dptf_power.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static struct attribute *dptf_power_attrs[] = { 
	NULL

	NULL

};

};





static struct attribute_group dptf_power_attribute_group = {

static const struct attribute_group dptf_power_attribute_group = {

	.attrs = dptf_power_attrs,

	.attrs = dptf_power_attrs,

	.name = "dptf_power"

	.name = "dptf_power"

};

};

drivers/acpi/osi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,8 @@ static void __init acpi_osi_dmi_darwin(bool enable, 
	__acpi_osi_setup_darwin(enable);

	__acpi_osi_setup_darwin(enable);

}

}





void __init acpi_osi_dmi_linux(bool enable, const struct dmi_system_id *d)

static void __init acpi_osi_dmi_linux(bool enable,

				      const struct dmi_system_id *d)

{

{

	pr_notice("DMI detected to setup _OSI(\"Linux\"): %s\n", d->ident);

	pr_notice("DMI detected to setup _OSI(\"Linux\"): %s\n", d->ident);

	osi_config.linux_dmi = 1;

	osi_config.linux_dmi = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE