| Message ID | 20210802120734.36732-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: dell-smbios: Remove unused dmi_system_id table | expand |
Hi All, On 8/2/21 2:07 PM, Hans de Goede wrote: > dell-smbios is depended on by dell-laptop and that has this same table + > some extra entries for chassis-type 30, 31 and 32. > > Since dell-laptop will already auto-load based on the DMI table in there > (which also is more complete) and since dell-laptop will then bring in > the dell-smbios module, the only scenario I can think of where this DMI > table inside dell-smbios-smm.c is useful is if users have the dell-laptop > module disabled and they want to use the sysfs interface offered by > dell-smbios-smm.c. But that is such a corner case, even requiring a custom > kernel build, that it does not weigh up against having this duplicate > table, which as the current state already shows can only grow stale. > > Users who do hit this corner-case can always explicitly modprobe / > insmod the module. > > Cc: Mario Limonciello <mario.limonciello@outlook.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> I've merged this into my review-hans (future pdx86/for-next) branch now. Regards, Hans > --- > drivers/platform/x86/dell/dell-smbios-smm.c | 31 --------------------- > 1 file changed, 31 deletions(-) > > diff --git a/drivers/platform/x86/dell/dell-smbios-smm.c b/drivers/platform/x86/dell/dell-smbios-smm.c > index 97c52a839a3e..320c032418ac 100644 > --- a/drivers/platform/x86/dell/dell-smbios-smm.c > +++ b/drivers/platform/x86/dell/dell-smbios-smm.c > @@ -24,37 +24,6 @@ static struct calling_interface_buffer *buffer; > static struct platform_device *platform_device; > static DEFINE_MUTEX(smm_mutex); > > -static const struct dmi_system_id dell_device_table[] __initconst = { > - { > - .ident = "Dell laptop", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > - DMI_MATCH(DMI_CHASSIS_TYPE, "8"), > - }, > - }, > - { > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > - DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/ > - }, > - }, > - { > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > - DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /*Notebook*/ > - }, > - }, > - { > - .ident = "Dell Computer Corporation", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), > - DMI_MATCH(DMI_CHASSIS_TYPE, "8"), > - }, > - }, > - { } > -}; > -MODULE_DEVICE_TABLE(dmi, dell_device_table); > - > static void parse_da_table(const struct dmi_header *dm) > { > struct calling_interface_structure *table = >
diff --git a/drivers/platform/x86/dell/dell-smbios-smm.c b/drivers/platform/x86/dell/dell-smbios-smm.c index 97c52a839a3e..320c032418ac 100644 --- a/drivers/platform/x86/dell/dell-smbios-smm.c +++ b/drivers/platform/x86/dell/dell-smbios-smm.c @@ -24,37 +24,6 @@ static struct calling_interface_buffer *buffer; static struct platform_device *platform_device; static DEFINE_MUTEX(smm_mutex); -static const struct dmi_system_id dell_device_table[] __initconst = { - { - .ident = "Dell laptop", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_CHASSIS_TYPE, "8"), - }, - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/ - }, - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /*Notebook*/ - }, - }, - { - .ident = "Dell Computer Corporation", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), - DMI_MATCH(DMI_CHASSIS_TYPE, "8"), - }, - }, - { } -}; -MODULE_DEVICE_TABLE(dmi, dell_device_table); - static void parse_da_table(const struct dmi_header *dm) { struct calling_interface_structure *table =
dell-smbios is depended on by dell-laptop and that has this same table + some extra entries for chassis-type 30, 31 and 32. Since dell-laptop will already auto-load based on the DMI table in there (which also is more complete) and since dell-laptop will then bring in the dell-smbios module, the only scenario I can think of where this DMI table inside dell-smbios-smm.c is useful is if users have the dell-laptop module disabled and they want to use the sysfs interface offered by dell-smbios-smm.c. But that is such a corner case, even requiring a custom kernel build, that it does not weigh up against having this duplicate table, which as the current state already shows can only grow stale. Users who do hit this corner-case can always explicitly modprobe / insmod the module. Cc: Mario Limonciello <mario.limonciello@outlook.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/dell/dell-smbios-smm.c | 31 --------------------- 1 file changed, 31 deletions(-)