Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd95532 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: SBS: Add sysfs alarm 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 66e4b72b

drivers/acpi/sbs.c

+32 −4
Original line number Diff line number Diff line
@@ -386,8 +386,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	return result;

}



#ifdef CONFIG_ACPI_PROCFS



static int acpi_battery_get_alarm(struct acpi_battery *battery)

{

	return acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
@@ -424,8 +422,6 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery) 
	return ret;

}



#endif



static int acpi_ac_get_present(struct acpi_sbs *sbs)

{

	int result;
@@ -438,6 +434,36 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs) 
	return result;

}



static ssize_t acpi_battery_alarm_show(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));

	acpi_battery_get_alarm(battery);

	return sprintf(buf, "%d\n", battery->alarm_capacity *

				acpi_battery_scale(battery) * 1000);

}



static ssize_t acpi_battery_alarm_store(struct device *dev,

					struct device_attribute *attr,

					const char *buf, size_t count)

{

	unsigned long x;

	struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));

	if (sscanf(buf, "%ld\n", &x) == 1)

		battery->alarm_capacity = x /

			(1000 * acpi_battery_scale(battery));

	if (battery->present)

		acpi_battery_set_alarm(battery);

	return count;

}



static struct device_attribute alarm_attr = {

	.attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

};



/* --------------------------------------------------------------------------

                              FS Interface (/proc/acpi)

   -------------------------------------------------------------------------- */
@@ -782,6 +808,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
	}

	battery->bat.get_property = acpi_sbs_battery_get_property;

	result = power_supply_register(&sbs->device->dev, &battery->bat);

	device_create_file(battery->bat.dev, &alarm_attr);

	printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",

	       ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),

	       battery->name, sbs->battery->present ? "present" : "absent");
@@ -791,6 +818,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
static void acpi_battery_remove(struct acpi_sbs *sbs, int id)

{

	if (sbs->battery[id].bat.dev)

		device_remove_file(sbs->battery[id].bat.dev, &alarm_attr);

		power_supply_unregister(&sbs->battery[id].bat);

#ifdef CONFIG_ACPI_PROCFS

	if (sbs->battery[id].proc_entry) {