From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37A932C1A2; Sun, 28 Jul 2024 00:50:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722127808; cv=none; b=FtnrBxGmKdqGoBz0wo0HMcclNY0Ilmc4mqa6iIO97fpoWK0ip5OWAIQrzjnQs9FR/D0fOO12bpBVAKv6gAVQQ/ivcb1dt3sJ/JqMCXHpUqCf7mS3GPqoQjVWMOe3g0FaEr4IKp2uL3ew8rTNM5/Bdem5kIYn36XtU03GzJsGDWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722127808; c=relaxed/simple; bh=7IvW698azK2cicY2FFrUG5aGPqPUyQsgiT+hnIdoIUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hK8+GWfQIGUrSLq8U8VXtmQ/g/bk6O7BjvxTEj7CTOsHW9slZ+HOMeNYTCxtk/Z4uHM8jP6azuIcnIDjlqj2eOZqILt+V/YezRbjRe0WqNjVw1+95wwIXvCFwRMyc9+ZQYKl88PAAnJfd2CKYJDmEnTM6I4uYhQoGJ3bsP8JmW4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mP/6y/jX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mP/6y/jX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 289DBC32781; Sun, 28 Jul 2024 00:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722127808; bh=7IvW698azK2cicY2FFrUG5aGPqPUyQsgiT+hnIdoIUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mP/6y/jXkeLCFASM7pRdz4U+pb3mNaNGOPo7dI2BJ2yfZeeOTZGn7SEnG9hpahScC SQUol2dpQmPPYChhSFra09rB3xpLMiI+j73S+vvNayGytsWmKBEQK6HMePsWtp0GE/ RmyGn0cBk2KC6PqVQq6/6G0EgUn5RPpMY5B80lW6oc8al0TIT5nEaj9VR5ciBC7YHF lfymC1d4AQqcSRnN1XrEMlVi5kQmDc85uX/pFbc9JgcKdvVD0oujCisoyodWE859l/ T7UqTDfdhUQzqTut33Ki8CRg+Y4mBfuBi36BrEOVpZlzgUny/91HzqJKl5DRqAJDSg nms1Ae/51tOnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 2/2] ACPI: SBS: manage alarm sysfs attribute through psy core Date: Sat, 27 Jul 2024 20:50:03 -0400 Message-ID: <20240728005004.1708494-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728005004.1708494-1-sashal@kernel.org> References: <20240728005004.1708494-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.164 Content-Transfer-Encoding: 8bit From: Thomas Weißschuh [ 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: Thomas Weißschuh Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/sbs.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 4938010fcac78..11083d0333d16 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -77,7 +77,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) @@ -462,12 +461,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 -------------------------------------------------------------------------- */ @@ -509,7 +514,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; @@ -539,10 +547,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: pr_info("%s [%s]: Battery Slot [%s] (battery %s)\n", ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), @@ -554,11 +558,8 @@ 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) -- 2.43.0