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

Commit d3eaa7fe authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Greg Kroah-Hartman
Browse files

ACPI: SBS: manage alarm sysfs attribute through psy core 



[ Upstream commit 6bad28cfc30988a845fb3f59a99f4b8a4ce8fe95 ]

Let the power supply core register the attribute.

This ensures that the attribute is created before the device is
announced to userspace, avoiding a race condition.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 79b7f33d

drivers/acpi/sbs.c

+12 −11
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct acpi_battery { 
	u16 spec;

	u8 id;

	u8 present:1;

	u8 have_sysfs_alarm:1;

};



#define to_acpi_battery(x) power_supply_get_drvdata(x)
@@ -465,12 +464,18 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
	return count;

}



static const struct device_attribute alarm_attr = {

static struct device_attribute alarm_attr = {

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

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

};



static struct attribute *acpi_battery_attrs[] = {

	&alarm_attr.attr,

	NULL

};

ATTRIBUTE_GROUPS(acpi_battery);



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

                                 Driver Interface

   -------------------------------------------------------------------------- */
@@ -512,7 +517,10 @@ static int acpi_battery_read(struct acpi_battery *battery) 
static int acpi_battery_add(struct acpi_sbs *sbs, int id)

{

	struct acpi_battery *battery = &sbs->battery[id];

	struct power_supply_config psy_cfg = { .drv_data = battery, };

	struct power_supply_config psy_cfg = {

		.drv_data = battery,

		.attr_grp = acpi_battery_groups,

	};

	int result;



	battery->id = id;
@@ -542,10 +550,6 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
		goto end;

	}



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

	if (result)

		goto end;

	battery->have_sysfs_alarm = 1;

      end:

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

	       ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
@@ -557,12 +561,9 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) 
{

	struct acpi_battery *battery = &sbs->battery[id];



	if (battery->bat) {

		if (battery->have_sysfs_alarm)

			device_remove_file(&battery->bat->dev, &alarm_attr);

	if (battery->bat)

		power_supply_unregister(battery->bat);

}

}



static int acpi_charger_add(struct acpi_sbs *sbs)

{