Skip to content

Commit

Permalink
ACPI / battery: use callback for setting up quirks
Browse files Browse the repository at this point in the history
Use callback for setting up quirk instead of checking return code
of dmi_check_system(). This change will allow using bat_dmi_table
for other quirks.

Signed-off-by: Alexander Mezin <mezin.alexander@gmail.com>
Acked-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Alexander Mezin authored and Rafael J. Wysocki committed Jun 17, 2014
1 parent 7171511 commit 3f5dc08
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/acpi/battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -1106,8 +1106,15 @@ static int battery_notify(struct notifier_block *nb,
return 0;
}

static int battery_bix_broken_package_quirk(const struct dmi_system_id *d)
{
battery_bix_broken_package = 1;
return 0;
}

static struct dmi_system_id bat_dmi_table[] = {
{
.callback = battery_bix_broken_package_quirk,
.ident = "NEC LZ750/LS",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
Expand Down Expand Up @@ -1227,8 +1234,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
if (acpi_disabled)
return;

if (dmi_check_system(bat_dmi_table))
battery_bix_broken_package = 1;
dmi_check_system(bat_dmi_table);

#ifdef CONFIG_ACPI_PROCFS_POWER
acpi_battery_dir = acpi_lock_battery_dir();
Expand Down

0 comments on commit 3f5dc08

Please sign in to comment.