TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: kempld: Switch back to earlier ->init() behavior

Browse Source 
Commit 9e36775c22c7 ("mfd: kempld: Remove custom DMI matching code")
removes the ability to load the driver if no matching system DMI data
is found. Before this commit the driver could be loaded using
alternative methods such as ACPI or `force_device_id` in the absence
of a matching system DMI entry.

Restore this ability while keeping the refactored
`platform_device_info` table.

Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/7d2c7e92253d851194a781720051536cca2722b8.camel@secunet.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Heijligen, Thomas 2025-07-31 14:45:00 +00:00 committed by Lee Jones
parent 597b398bc2
commit 309e65d151
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/mfd/kempld-core.c
View File

@ -779,22 +779,26 @@ MODULE_DEVICE_TABLE(dmi, kempld_dmi_table);
static int __init kempld_init(void)
{
const struct dmi_system_id *id;
int ret = -ENODEV;
for (id = dmi_first_match(kempld_dmi_table); id; id = dmi_first_match(id + 1)) {
/* Check, if user asked for the exact device ID match */
if (force_device_id[0] && !strstr(id->ident, force_device_id))
continue;
ret = kempld_create_platform_device(&kempld_platform_data_generic);
if (ret)
continue;
break;
/*
* This custom DMI iteration allows the driver to be initialized in three ways:
* - When a forced_device_id string matches any ident in the kempld_dmi_table,
* regardless of whether the DMI device is present in the system dmi table.
* - When a matching entry is present in the DMI system tabe.
* - Through alternative mechanisms like ACPI.
*/
if (force_device_id[0]) {
for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++)
if (strstr(id->ident, force_device_id))
if (!kempld_create_platform_device(&kempld_platform_data_generic))
break;
if (id->matches[0].slot == DMI_NONE)
return -ENODEV;
} else {
for (id = dmi_first_match(kempld_dmi_table); id; id = dmi_first_match(id+1))
if (kempld_create_platform_device(&kempld_platform_data_generic))
break;
}
if (ret)
return ret;
return platform_driver_register(&kempld_driver);
}