Received-SPF: pass (google.com: domain of linux-kernel+bounces-89213-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Sebastian Reichel <sebastian.reichel@collabora.com>
Date: Fri, 01 Mar 2024 23:58:27 +0100
Subject: [PATCH 2/2] power: supply: core: simplify power_supply_class_init
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240301-psy-class-cleanup-v1-2-aebe8c4b6b08@collabora.com>
References: <20240301-psy-class-cleanup-v1-0-aebe8c4b6b08@collabora.com>
In-Reply-To: <20240301-psy-class-cleanup-v1-0-aebe8c4b6b08@collabora.com>
To: Linus Walleij <linus.walleij@linaro.org>, 
 "Ricardo B. Marliere" <ricardo@marliere.net>, 
 Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, 
 Sebastian Reichel <sebastian.reichel@collabora.com>

Technically the sysfs attributes should be initialized
before the class is registered, since that will use them.
As a nice side effect this nicely simplifies the code,
since it allows dropping the helper variable.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 drivers/power/supply/power_supply_core.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 0eb8a57dda70..4daea6ed8f1d 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1622,15 +1622,8 @@ EXPORT_SYMBOL_GPL(power_supply_get_drvdata);
 
 static int __init power_supply_class_init(void)
 {
-	int err;
-
-	err = class_register(&power_supply_class);
-	if (err)
-		return err;
-
 	power_supply_init_attrs();
-
-	return 0;
+	return class_register(&power_supply_class);
 }
 
 static void __exit power_supply_class_exit(void)

-- 
2.43.0