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 29E80189F55; Sun, 28 Jul 2024 00:49:37 +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=1722127778; cv=none; b=GiRF+zkAwa7qjtIU+tyaFe6uMsZMYsaOpli33J9KTnILD5DBQNnggSAIygETf3oyhg9E9CdWJN1QAcgnUmi7n+kCaXXw448gAEuCS3hQsvhN679CEQehC0oG72Cm0ejCUtL+zzyy3CeL+lyNILZ6Ffj8rFtbAaQs7x1lgP3NH+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722127778; c=relaxed/simple; bh=al5kv4+Fr2JvKSYX25TsPEWXP8udlEeoBpj7duSN5cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=K0W1V3e07IKrHRSDUBDJT3EkkTgijksYmNJ/6YLs3Pm49i8X9jkfaW++Eq6duv8PNQ1PhKgdb1X2WcLNb2xA3b7CDiZcXA+xOryHmTjuFNXGm/1BgtXbCCI3q0DGuPUrgvpg/vIy4tjSBUvT+aRV0oowA2jclDW9WRcB6d1Z8xA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lwYfG+3T; 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="lwYfG+3T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF280C32781; Sun, 28 Jul 2024 00:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722127777; bh=al5kv4+Fr2JvKSYX25TsPEWXP8udlEeoBpj7duSN5cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lwYfG+3TX37XpeX8BIZ3w0MPeEtOMJVZ0B7aDtC5Y64wHk2Gk5s3RRteXtnUDuFRy MoQzv51oy3ELPdvo4BrGCXTR2cUY+It28i/oxYOpKxlsXGTPuZPc32kIpaTa0Bp/CH dPoJH3xuaa2sL9UWAihGUOIqXh5UsEFaJm3KwRCvkP3Wo1Mics0yMxCn9tizLws72o cQAQu6Gz4Qe59aCKN80z4IxNHAYsm/TlL3oA6kzqD5gp0RnFUt9KJaI3pUnlFZg+Vi qMW6hX/p3D2SfBEMbrrQrJgVUpQ54pwcTDFzpFrFuCwrq89anHYT7BuiHzvikld2gt ICiSIKBAfclYQ== 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 6.10 2/9] ACPI: SBS: manage alarm sysfs attribute through psy core Date: Sat, 27 Jul 2024 20:49:22 -0400 Message-ID: <20240728004934.1706375-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728004934.1706375-1-sashal@kernel.org> References: <20240728004934.1706375-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 6.10.2 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 dc8164b182dcc..442c5905d43be 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 -------------------------------------------------------------------------- */ @@ -518,7 +523,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; @@ -548,10 +556,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), @@ -563,11 +567,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