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

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

Merge branch 'acpi-driver-core' into device-properties

parents f42712a9 ca5b74d2

drivers/acpi/acpi_platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.id = -1;

	pdevinfo.id = -1;

	pdevinfo.res = resources;

	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.num_res = count;

	pdevinfo.acpi_node.companion = adev;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.dma_mask = DMA_BIT_MASK(32);

	pdevinfo.dma_mask = DMA_BIT_MASK(32);

	pdev = platform_device_register_full(&pdevinfo);

	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

	if (IS_ERR(pdev))

drivers/acpi/dock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ void acpi_dock_add(struct acpi_device *adev) 
	memset(&pdevinfo, 0, sizeof(pdevinfo));

	memset(&pdevinfo, 0, sizeof(pdevinfo));

	pdevinfo.name = "dock";

	pdevinfo.name = "dock";

	pdevinfo.id = dock_station_count;

	pdevinfo.id = dock_station_count;

	pdevinfo.acpi_node.companion = adev;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.data = &ds;

	pdevinfo.data = &ds;

	pdevinfo.size_data = sizeof(ds);

	pdevinfo.size_data = sizeof(ds);

	dd = platform_device_register_full(&pdevinfo);

	dd = platform_device_register_full(&pdevinfo);

drivers/acpi/glue.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	unsigned int node_id;

	unsigned int node_id;

	int retval = -EINVAL;

	int retval = -EINVAL;





	if (ACPI_COMPANION(dev)) {

	if (has_acpi_companion(dev)) {

		if (acpi_dev) {

		if (acpi_dev) {

			dev_warn(dev, "ACPI companion already set\n");

			dev_warn(dev, "ACPI companion already set\n");

			return -EINVAL;

			return -EINVAL;
@@ -220,7 +220,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	list_add(&physical_node->node, physnode_list);

	list_add(&physical_node->node, physnode_list);

	acpi_dev->physical_node_count++;

	acpi_dev->physical_node_count++;





	if (!ACPI_COMPANION(dev))

	if (!has_acpi_companion(dev))

		ACPI_COMPANION_SET(dev, acpi_dev);

		ACPI_COMPANION_SET(dev, acpi_dev);





	acpi_physnode_link_name(physical_node_name, node_id);

	acpi_physnode_link_name(physical_node_name, node_id);

drivers/base/platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ struct platform_device *platform_device_register_full( 
		goto err_alloc;

		goto err_alloc;





	pdev->dev.parent = pdevinfo->parent;

	pdev->dev.parent = pdevinfo->parent;

	ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion);

	pdev->dev.fwnode = pdevinfo->fwnode;





	if (pdevinfo->dma_mask) {

	if (pdevinfo->dma_mask) {

		/*

		/*

drivers/gpio/gpiolib.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 




enum of_gpio_flags;

enum of_gpio_flags;





struct acpi_device;



/**

/**

 * struct acpi_gpio_info - ACPI GPIO specific information

 * struct acpi_gpio_info - ACPI GPIO specific information

 * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo

 * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo