diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/ac.c | 2 | ||||
-rw-r--r-- | drivers/acpi/battery.c | 3 | ||||
-rw-r--r-- | drivers/acpi/sbs.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 36b0e61f9c09..8bf516885ede 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
@@ -351,7 +351,7 @@ static int acpi_ac_add(struct acpi_device *device) | |||
351 | ac->charger.properties = ac_props; | 351 | ac->charger.properties = ac_props; |
352 | ac->charger.num_properties = ARRAY_SIZE(ac_props); | 352 | ac->charger.num_properties = ARRAY_SIZE(ac_props); |
353 | ac->charger.get_property = get_ac_property; | 353 | ac->charger.get_property = get_ac_property; |
354 | result = power_supply_register(&ac->device->dev, &ac->charger); | 354 | result = power_supply_register(&ac->device->dev, &ac->charger, NULL); |
355 | if (result) | 355 | if (result) |
356 | goto end; | 356 | goto end; |
357 | 357 | ||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index d98ba4355819..fd8c06f492a1 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -624,7 +624,8 @@ static int sysfs_add_battery(struct acpi_battery *battery) | |||
624 | battery->bat.type = POWER_SUPPLY_TYPE_BATTERY; | 624 | battery->bat.type = POWER_SUPPLY_TYPE_BATTERY; |
625 | battery->bat.get_property = acpi_battery_get_property; | 625 | battery->bat.get_property = acpi_battery_get_property; |
626 | 626 | ||
627 | result = power_supply_register_no_ws(&battery->device->dev, &battery->bat); | 627 | result = power_supply_register_no_ws(&battery->device->dev, |
628 | &battery->bat, NULL); | ||
628 | 629 | ||
629 | if (result) | 630 | if (result) |
630 | return result; | 631 | return result; |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index a7a3edd28beb..2038ec1d021d 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -540,7 +540,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) | |||
540 | ARRAY_SIZE(sbs_energy_battery_props); | 540 | ARRAY_SIZE(sbs_energy_battery_props); |
541 | } | 541 | } |
542 | battery->bat.get_property = acpi_sbs_battery_get_property; | 542 | battery->bat.get_property = acpi_sbs_battery_get_property; |
543 | result = power_supply_register(&sbs->device->dev, &battery->bat); | 543 | result = power_supply_register(&sbs->device->dev, &battery->bat, NULL); |
544 | if (result) | 544 | if (result) |
545 | goto end; | 545 | goto end; |
546 | 546 | ||
@@ -580,7 +580,7 @@ static int acpi_charger_add(struct acpi_sbs *sbs) | |||
580 | sbs->charger.properties = sbs_ac_props; | 580 | sbs->charger.properties = sbs_ac_props; |
581 | sbs->charger.num_properties = ARRAY_SIZE(sbs_ac_props); | 581 | sbs->charger.num_properties = ARRAY_SIZE(sbs_ac_props); |
582 | sbs->charger.get_property = sbs_get_ac_property; | 582 | sbs->charger.get_property = sbs_get_ac_property; |
583 | power_supply_register(&sbs->device->dev, &sbs->charger); | 583 | power_supply_register(&sbs->device->dev, &sbs->charger, NULL); |
584 | printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n", | 584 | printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n", |
585 | ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), | 585 | ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), |
586 | ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line"); | 586 | ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line"); |