The patch titled acpi: put acpi_battery_get/set_alarm into CONFIG_ACPI_SYSFS_POWER has been added to the -mm tree. Its filename is acpi-put-acpi_battery_get-set_alarm-into-config_acpi_sysfs_power.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: acpi: put acpi_battery_get/set_alarm into CONFIG_ACPI_SYSFS_POWER From: Rakib Mullick <rakib.mullick@xxxxxxxxx> acpi_battery_get/set_alarm is only used when CONFIG_ACPI_SYSFS_POWER=y. So put this two functions under CONFIG_ACPI_SYSFS_POWER by shifting it upward. We were warned by the following warnings: drivers/acpi/sbs.c:399: warning: ?acpi_battery_get_alarm? defined but not used drivers/acpi/sbs.c:406: warning: ?acpi_battery_set_alarm? defined but not used Also fixes a checkpatch warning in acpi_ac_get_present. ERROR: space prohibited after that '&' (ctx:WxW) #13: FILE: drivers/acpi/sbs.c:405: + 0x13, (u8 *) & status); ^ Signed-off-by: Rakib Mullick <rakib.mullick@xxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/acpi/sbs.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff -puN drivers/acpi/sbs.c~acpi-put-acpi_battery_get-set_alarm-into-config_acpi_sysfs_power drivers/acpi/sbs.c --- a/drivers/acpi/sbs.c~acpi-put-acpi_battery_get-set_alarm-into-config_acpi_sysfs_power +++ a/drivers/acpi/sbs.c @@ -400,6 +400,20 @@ static int acpi_battery_get_state(struct return result; } +static int acpi_ac_get_present(struct acpi_sbs *sbs) +{ + int result; + u16 status; + + result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_CHARGER, + 0x13, (u8 *) &status); + if (!result) + sbs->charger_present = (status >> 15) & 0x1; + return result; +} + +#ifdef CONFIG_ACPI_SYSFS_POWER + static int acpi_battery_get_alarm(struct acpi_battery *battery) { return acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, @@ -436,19 +450,6 @@ static int acpi_battery_set_alarm(struct return ret; } -static int acpi_ac_get_present(struct acpi_sbs *sbs) -{ - int result; - u16 status; - - result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_CHARGER, - 0x13, (u8 *) & status); - if (!result) - sbs->charger_present = (status >> 15) & 0x1; - return result; -} - -#ifdef CONFIG_ACPI_SYSFS_POWER static ssize_t acpi_battery_alarm_show(struct device *dev, struct device_attribute *attr, char *buf) _ Patches currently in -mm which might be from rakib.mullick@xxxxxxxxx are linux-next.patch acpi-put-acpi_battery_get-set_alarm-into-config_acpi_sysfs_power.patch smp-fix-documentation-in-include-linux-smph.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html