Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACPI / battery: use callback for setting up quirks

Browse Source 
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>
This commit is contained in:
Alexander Mezin 2014-06-04 02:01:22 +07:00 committed by Rafael J. Wysocki
parent 7171511eae
commit 3f5dc08f56
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/acpi/battery.c
View File

@ -1106,8 +1106,15 @@ static int battery_notify(struct notifier_block *nb,
return 0; 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[] = { static struct dmi_system_id bat_dmi_table[] = {
{ {
.callback = battery_bix_broken_package_quirk,
.ident = "NEC LZ750/LS", .ident = "NEC LZ750/LS",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "NEC"), DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
@ -1227,8 +1234,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
if (acpi_disabled) if (acpi_disabled)
return; return;
if (dmi_check_system(bat_dmi_table)) dmi_check_system(bat_dmi_table);
battery_bix_broken_package = 1;
#ifdef CONFIG_ACPI_PROCFS_POWER #ifdef CONFIG_ACPI_PROCFS_POWER
acpi_battery_dir = acpi_lock_battery_dir(); acpi_battery_dir = acpi_lock_battery_dir();