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

Merge branches 'acpica' and 'acpi-bus' 

Merge an ACPICA fix and a core ACPI support code fix for 7.0-rc5:

 - Update the format of the last argument of _DSM to avoid printing
   confusing error messages in some cases (Saket Dumbre)

 - Fix MFD child automatic modprobe issue by removing a stale check
   from acpi_companion_match() (Pratap Nirujogi)

* acpica:
  ACPICA: Update the format of Arg3 of _DSM

* acpi-bus:
  ACPI: bus: Fix MFD child automatic modprobe issue
parents bf504b22 ab93d7ee e7648ffe

drivers/acpi/acpica/acpredef.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 


	{{"_DSM",

	  METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,

		       ACPI_TYPE_ANY | ACPI_TYPE_PACKAGE) |

		       ACPI_TYPE_PACKAGE | ACPI_TYPE_ANY) |

		       ARG_COUNT_IS_MINIMUM,

	  METHOD_RETURNS(ACPI_RTYPE_ALL)}},	/* Must return a value, but it can be of any type */

drivers/acpi/bus.c

+0 −3
Original line number Diff line number Diff line
@@ -818,9 +818,6 @@ const struct acpi_device *acpi_companion_match(const struct device *dev) 
	if (list_empty(&adev->pnp.ids))

		return NULL;



	if (adev->pnp.type.backlight)

		return adev;



	return acpi_primary_dev_companion(adev, dev);

}