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

Commit 32261868 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-extra-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more ACPI updates from Rafael Wysocki:
 "These fix the ACPI SPCR table handling and add a workaround for APM
  X-Gene 8250 UART on top of that, fix two ACPI hotplug issues related
  to hot-remove failures, add a missing "static" to one function and
  constify some attribute_group structures.

  Specifics:

   - Fix the ACPI code handling the SPCR table to check access width of
     MMIO regions and add a workaround for APM X-Gene 8250 UART to use
     32-bit MMIO accesses with its register (Loc Ho).

   - Fix two ACPI-based hotplug issues related to the handling of
     hot-remove failures on the OS side (Chun-Yi Lee).

   - Constify attribute_group structures in a few places (Arvind Yadav).

   - Make one local function static (Colin Ian King)"

* tag 'acpi-extra-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / DPTF: constify attribute_group structures
  ACPI / LPSS: constify attribute_group structures
  ACPI: BGRT: constify attribute_group structures
  ACPI / power: constify attribute_group structures
  ACPI / scan: Indicate to platform when hot remove returns busy
  ACPI / bus: handle ACPI hotplug schedule errors completely
  ACPI / osi: Make local function acpi_osi_dmi_linux() static
  ACPI: SPCR: Workaround for APM X-Gene 8250 UART 32-alignment errata
  ACPI: SPCR: Use access width to determine mmio usage
parents 1633b396 f19e80b3

drivers/acpi/acpi_lpss.c

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

};



static struct attribute_group lpss_attr_group = {

static const struct attribute_group lpss_attr_group = {

	.attrs = lpss_attrs,

	.name = "lpss_ltr",

};

drivers/acpi/bgrt.c

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

};



static struct attribute_group bgrt_attribute_group = {

static const struct attribute_group bgrt_attribute_group = {

	.attrs = bgrt_attributes,

	.bin_attrs = bgrt_bin_attributes,

};

drivers/acpi/bus.c

+6 −2
Original line number 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->ops.notify(adev, type);



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

	if (!hotplug_event) {

		acpi_bus_put_acpi_device(adev);

		return;

	}



	acpi_bus_put_acpi_device(adev);

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

		return;



	acpi_bus_put_acpi_device(adev);



 err:

	acpi_evaluate_ost(handle, type, ost_code, NULL);

}

drivers/acpi/dptf/dptf_power.c

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

};



static struct attribute_group dptf_power_attribute_group = {

static const struct attribute_group dptf_power_attribute_group = {

	.attrs = dptf_power_attrs,

	.name = "dptf_power"

};

drivers/acpi/osi.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static void __init acpi_osi_dmi_darwin(bool 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);

	osi_config.linux_dmi = 1;