Skip to contentSkip to conversation

ACPI: bus: Fix MFD child automatic modprobe issue

PATCH In review Pratap Nirujogi 3 participants 3 messages Mar 18 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: bus: Fix MFD child automatic modprobe issue

MFD child devices sharing parent's ACPI Companion fails to probe as acpi_companion_match() returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check in acpi_companion_match() to fix the automatic modprobe issue.

Fixes 7a7a7ed5f8bdb ("ACPI: scan: Register platform devices for backlight device objects")
---
 drivers/acpi/bus.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/acpi/bus.c +0 -3
index f6707325f5821..2ec095e2009e4 100644
@@ -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);
 }
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 18 lines · Pratap Nirujogi

MFD child devices sharing parent's ACPI Companion fails to probe as acpi_companion_match() returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check in acpi_companion_match() to fix the automatic modprobe issue.

Fixes 7a7a7ed5f8bdb ("ACPI: scan: Register platform devices for backlight device objects")
---
 drivers/acpi/bus.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/acpi/bus.c +0 -0
index f6707325f5821..2ec095e2009e4 100644

drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev) · line 823

Quoted 6 lines
drivers/acpi/bus.c +0 -3
@@ -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;
-

Good catch!

I forgot to remove this in

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=acpi-7.0-rc4&id=6ab3532b4c98f4e51969f0e5f3fc919c535f3ce1

drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev)

Quoted 4 lines
drivers/acpi/bus.c +0 -1
        return acpi_primary_dev_companion(adev, dev);
 }
 
--

So applied as 7.0-rc material, thanks!

#2 lore raw
Quoted 33 lines · Rafael J. Wysocki

Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.

Quoted 18 lines · Pratap Nirujogi

MFD child devices sharing parent's ACPI Companion fails to probe as acpi_companion_match() returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check in acpi_companion_match() to fix the automatic modprobe issue.

Fixes 7a7a7ed5f8bdb ("ACPI: scan: Register platform devices for backlight device objects")
---
  drivers/acpi/bus.c | 3 ---
  1 file changed, 3 deletions(-)
drivers/acpi/bus.c +0 -0
index f6707325f5821..2ec095e2009e4 100644

drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev) · line 823

Quoted 6 lines
drivers/acpi/bus.c +0 -3
@@ -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;
-

Good catch!

I forgot to remove this in

Quoted 8 lines

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=acpi-7.0-rc4&id=6ab3532b4c98f4e51969f0e5f3fc919c535f3ce1

drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev)

Quoted 4 lines
drivers/acpi/bus.c +0 -1
         return acpi_primary_dev_companion(adev, dev);
  }
 
--

So applied as 7.0-rc material, thanks!

Thanks, Rafael.