On Sunday, February 23, 2020 3:29:40 PM CET Hans de Goede wrote:
> The 3 different entries we have sofar all use different identation and
> 2 of the use DMI_MATCH where as 1 unnecessarily used DMI_EXACT_MATCH
> Fix this to just use full tab idents for each level and DMI_MATCH
> everywhere and sort the entries alphabetically.
>
> Also add a bit of text to the comments explaining why the quirk is
> necessary.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> drivers/acpi/ac.c | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
> index 829f37d36b9f..69d2db13886b 100644
> --- a/drivers/acpi/ac.c
> +++ b/drivers/acpi/ac.c
> @@ -293,29 +293,30 @@ static int __init ac_do_not_check_pmic_quirk(const struct dmi_system_id *d)
> return 0;
> }
>
> +/* Please keep this list alphabetically sorted */
> static const struct dmi_system_id ac_dmi_table[] __initconst = {
> {
> - /* Thinkpad e530 */
> - .callback = thinkpad_e530_quirk,
> - .matches = {
> - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> - DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),
> + /* ECS EF20EA, AXP288 PMIC but uses separate fuel-gauge */
> + .callback = ac_do_not_check_pmic_quirk,
> + .matches = {
> + DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
> },
> },
> {
> - /* ECS EF20EA */
> + /* Lenovo Ideapad Miix 320, AXP288 PMIC, separate fuel-gauge */
> .callback = ac_do_not_check_pmic_quirk,
> .matches = {
> - DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "80XF"),
> + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),
> },
> },
> {
> - /* Lenovo Ideapad Miix 320 */
> - .callback = ac_do_not_check_pmic_quirk,
> + /* Lenovo Thinkpad e530, see comment in acpi_ac_notify() */
> + .callback = thinkpad_e530_quirk,
> .matches = {
> - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "80XF"),
> - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),
> },
> },
> {},
>
Both patches in the series applied as 5.7 material, thanks!
