Merge branches 'acpi-scan', 'acpi-bus' and 'acpi-platform'

Merge changes related to ACPI device enumeration and ACPI support for
platform devices for 6.1-rc1:

 - Clean up ACPI platform devices support code (Andy Shevchenko, John
   Garry).

 - Clean up ACPI bus management code (Andy Shevchenko, ye xingchen).

 - Add support for multiple DMA windows with different offsets to the
   ACPI device enumeration code and use it on LoongArch (Jianmin Lv).

* acpi-scan:
  LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA
  ACPI: scan: Support multiple DMA windows with different offsets

* acpi-bus:
  ACPI: bus: Refactor ACPI matching functions for better readability
  ACPI: bus: Drop kernel doc annotation from acpi_bus_notify()
  ACPI: bus: Remove the unneeded result variable

* acpi-platform:
  ACPI: platform: Use PLATFORM_DEVID_NONE in acpi_create_platform_device()
  ACPI: platform: Sort forbidden_id_list[] in ascending order
  ACPI: platform: Use sizeof(*pointer) instead of sizeof(type)
  ACPI: platform: Remove redundant print on -ENOMEM
  ACPI: platform: Get rid of redundant 'else'

diff --cc drivers/acpi/acpi_platform.c
index 1a1c78b23fba383f59daeeb133615124c9fa02c6,de3cbf152deef1aebeac08fa784ff0272baaa36c,de3cbf152deef1aebeac08fa784ff0272baaa36c,ebd18c716b5013007a7fe6d6070928b91dbf8989..fe00a5783f53f48798c6784126b0d95f9909e50a
--- 1/drivers/acpi/acpi_platform.c
--- 2/drivers/acpi/acpi_platform.c
--- 3/drivers/acpi/acpi_platform.c
--- 4/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@@@@ -138,9 -137,10 -137,10 -135,10 +136,9 @@@@@ struct platform_device *acpi_create_pla
         * attached to it, that physical device should be the parent of the
         * platform device we are about to create.
         */
 ---    pdevinfo.parent = adev->parent ?
 ---            acpi_get_first_physical_node(adev->parent) : NULL;
 +++    pdevinfo.parent = parent ? acpi_get_first_physical_node(parent) : NULL;
        pdevinfo.name = dev_name(&adev->dev);
---     pdevinfo.id = -1;
+++     pdevinfo.id = PLATFORM_DEVID_NONE;
        pdevinfo.res = resources;
        pdevinfo.num_res = count;
        pdevinfo.fwnode = acpi_fwnode_handle(adev);

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/scan.c
index d0277427e7ee1785baaed69d46deb3b4f20341af,f96ef8536037af931e97a44cb6f932105da9714d,42cec8120f18e513d60bed04c3d1b1a389f26864,42cec8120f18e513d60bed04c3d1b1a389f26864..558664d169fcc3e10acf1f61f5f24134c97471a4
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
--- 3/drivers/acpi/scan.c
--- 4/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@@@ -2235,24 -2228,11 -2235,11 -2235,11 +2228,24 @@@@@ ok
        return 0;
    }
    
 ---static int acpi_dev_get_first_consumer_dev_cb(struct acpi_dep_data *dep, void *data)
 +++static int acpi_dev_get_next_consumer_dev_cb(struct acpi_dep_data *dep, void *data)
    {
 ---    struct acpi_device *adev;
 +++    struct acpi_device **adev_p = data;
 +++    struct acpi_device *adev = *adev_p;
 +  
  --    adev = acpi_bus_get_acpi_device(dep->consumer);
 +++    /*
 +++     * If we're passed a 'previous' consumer device then we need to skip
 +++     * any consumers until we meet the previous one, and then NULL @data
 +++     * so the next one can be returned.
 +++     */
 +++    if (adev) {
 +++            if (dep->consumer == adev->handle)
 +++                    *adev_p = NULL;
 +++
 +++            return 0;
 +++    }
  ++
 -      adev = acpi_bus_get_acpi_device(dep->consumer);
 +++    adev = acpi_get_acpi_dev(dep->consumer);
        if (adev) {
                *(struct acpi_device **)data = adev;
                return 1;

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge