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

Commit 86e4ee76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Fix a recent regression in the 8250_dw serial driver introduced by
  adding a quirk for the APM X-Gene SoC to it which uncovered an issue
  related to the handling of built-in device properties in the core ACPI
  device enumeration code (Heikki Krogerus)"

* tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / platform: Add support for build-in properties
parents b9f659b8 66f5854c

drivers/acpi/acpi_apd.c

+2 −8
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int acpi_apd_create_device(struct acpi_device *adev, 
	int ret;



	if (!dev_desc) {

		pdev = acpi_create_platform_device(adev);

		pdev = acpi_create_platform_device(adev, NULL);

		return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;

	}
@@ -139,14 +139,8 @@ static int acpi_apd_create_device(struct acpi_device *adev, 
			goto err_out;

	}



	if (dev_desc->properties) {

		ret = device_add_properties(&adev->dev, dev_desc->properties);

		if (ret)

			goto err_out;

	}



	adev->driver_data = pdata;

	pdev = acpi_create_platform_device(adev);

	pdev = acpi_create_platform_device(adev, dev_desc->properties);

	if (!IS_ERR_OR_NULL(pdev))

		return 1;

drivers/acpi/acpi_lpss.c

+2 −8
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 


	dev_desc = (const struct lpss_device_desc *)id->driver_data;

	if (!dev_desc) {

		pdev = acpi_create_platform_device(adev);

		pdev = acpi_create_platform_device(adev, NULL);

		return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;

	}

	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
@@ -451,14 +451,8 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
		goto err_out;

	}



	if (dev_desc->properties) {

		ret = device_add_properties(&adev->dev, dev_desc->properties);

		if (ret)

			goto err_out;

	}



	adev->driver_data = pdata;

	pdev = acpi_create_platform_device(adev);

	pdev = acpi_create_platform_device(adev, dev_desc->properties);

	if (!IS_ERR_OR_NULL(pdev)) {

		return 1;

	}

drivers/acpi/acpi_platform.c

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, 
/**

 * acpi_create_platform_device - Create platform device for ACPI device node

 * @adev: ACPI device node to create a platform device for.

 * @properties: Optional collection of build-in properties.

 *

 * Check if the given @adev can be represented as a platform device and, if

 * that's the case, create and register a platform device, populate its common
@@ -57,7 +58,8 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, 
 *

 * Name of the platform device will be the same as @adev's.

 */

struct platform_device *acpi_create_platform_device(struct acpi_device *adev)

struct platform_device *acpi_create_platform_device(struct acpi_device *adev,

					struct property_entry *properties)

{

	struct platform_device *pdev = NULL;

	struct platform_device_info pdevinfo;
@@ -106,6 +108,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.properties = properties;



	if (acpi_dma_supported(adev))

		pdevinfo.dma_mask = DMA_BIT_MASK(32);

drivers/acpi/dptf/int340x_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev, 
					const struct acpi_device_id *id)

{

	if (IS_ENABLED(CONFIG_INT340X_THERMAL))

		acpi_create_platform_device(adev);

		acpi_create_platform_device(adev, NULL);

	/* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */

	else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) &&

		 id->driver_data == INT3401_DEVICE)

		acpi_create_platform_device(adev);

		acpi_create_platform_device(adev, NULL);

	return 1;

}

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static void acpi_default_enumeration(struct acpi_device *device) 
			       &is_spi_i2c_slave);

	acpi_dev_free_resource_list(&resource_list);

	if (!is_spi_i2c_slave) {

		acpi_create_platform_device(device);

		acpi_create_platform_device(device, NULL);

		acpi_device_set_enumerated(device);

	} else {

		blocking_notifier_call_chain(&acpi_reconfig_chain,