From nobody Wed Dec 17 19:55:23 2025 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 687D51386DA; Sun, 8 Dec 2024 13:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733662963; cv=none; b=rXIUMhG+lhokmqu2v+jXmMIbVnf34o7fiJGzpU6NC3Y25zj8C0gIO7+f+gvyw3Wk8t88QhQ5+Zk1XAnI5rj+6mTCrXvGaP4SvqD6h0fPy3osufCGQaPPpGrB5QjynJ+kwjVB70L0UyROuA6mvZU9i++mFw0H/Yc6kW6gafJy5w0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733662963; c=relaxed/simple; bh=YkNrJgESTFAyTUd0+T8p/6aBvt4WlaBqGr2px019fMM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g/Xr2QLtshRRj544gFgGdR6QdIt6E0TSNSZBmmfhGRUeTxlyLNcVEFXZQ6zp7hMDIHAC9zAgo5Y1tqhkBxVgI8Uhz6wnTygC37/wbQuTdo2O9tsTCG269JEi/hS2mWD6tdJFWjTI8d6x8SUST0JOIZk1LYIFKiSd3sdJFlFYhiw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=MvCuLg30; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="MvCuLg30" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1733662958; bh=YkNrJgESTFAyTUd0+T8p/6aBvt4WlaBqGr2px019fMM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MvCuLg30ZH7cPvg8RjelZgVUxrPCedm+yy49ec6fVEDOihG/gU0QCPWli4ihnTBxt XejvKx3tV5cym61IOabTJIz4XA9al7KtWkzh77qvjPoNEWt8Q49fj1GyEZGtjQKlnQ yntgExpzrrPHBd0E23jQWpmaMlzrtOLeVjCB/xJo= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 08 Dec 2024 14:02:35 +0100 Subject: [PATCH 03/14] power: supply: core: use power_supply_for_each_psy() 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" Content-Transfer-Encoding: quoted-printable Message-Id: <20241208-power-supply-dev_to_psy-v1-3-f95de9117558@weissschuh.net> References: <20241208-power-supply-dev_to_psy-v1-0-f95de9117558@weissschuh.net> In-Reply-To: <20241208-power-supply-dev_to_psy-v1-0-f95de9117558@weissschuh.net> To: Sebastian Reichel , Linus Walleij , Maximilian Luz , =?utf-8?q?Pali_Roh=C3=A1r?= , Konrad Dybcio Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733662957; l=6259; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=YkNrJgESTFAyTUd0+T8p/6aBvt4WlaBqGr2px019fMM=; b=6kYBq+otDhKf3yiBunseZ5ENkNwrjMfcw+Qu29NzUue91gehtr5ZzEt3f8H7zMjcLlPZk3Z31 xFRHFAyEj9oA2VFCieD3rw1WGRfTATHKkVT+uZuUCsa4HwYLVchw3m8 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Simplify the callbacks by removing the need to convert a 'struct device' into a 'struct power_supply'. Signed-off-by: Thomas Wei=C3=9Fschuh --- drivers/power/supply/power_supply_core.c | 36 +++++++++++++---------------= ---- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/suppl= y/power_supply_core.c index 48bc968ff6c54d4b196c3faf450ef6464cdb305d..9adea87c69124f7025a06fe7550= 892392e28cd65 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -66,10 +66,9 @@ static bool __power_supply_is_supplied_by(struct power_s= upply *supplier, return false; } =20 -static int __power_supply_changed_work(struct device *dev, void *data) +static int __power_supply_changed_work(struct power_supply *pst, void *dat= a) { struct power_supply *psy =3D data; - struct power_supply *pst =3D dev_get_drvdata(dev); =20 if (__power_supply_is_supplied_by(psy, pst)) { if (pst->desc->external_power_changed) @@ -98,7 +97,7 @@ static void power_supply_changed_work(struct work_struct = *work) if (likely(psy->changed)) { psy->changed =3D false; spin_unlock_irqrestore(&psy->changed_lock, flags); - power_supply_for_each_device(psy, __power_supply_changed_work); + power_supply_for_each_psy(psy, __power_supply_changed_work); power_supply_update_leds(psy); blocking_notifier_call_chain(&power_supply_notifier, PSY_EVENT_PROP_CHANGED, psy); @@ -190,11 +189,10 @@ static void power_supply_deferred_register_work(struc= t work_struct *work) } =20 #ifdef CONFIG_OF -static int __power_supply_populate_supplied_from(struct device *dev, +static int __power_supply_populate_supplied_from(struct power_supply *epsy, void *data) { struct power_supply *psy =3D data; - struct power_supply *epsy =3D dev_get_drvdata(dev); struct device_node *np; int i =3D 0; =20 @@ -221,20 +219,19 @@ static int power_supply_populate_supplied_from(struct= power_supply *psy) { int error; =20 - error =3D power_supply_for_each_device(psy, __power_supply_populate_suppl= ied_from); + error =3D power_supply_for_each_psy(psy, __power_supply_populate_supplied= _from); =20 dev_dbg(&psy->dev, "%s %d\n", __func__, error); =20 return error; } =20 -static int __power_supply_find_supply_from_node(struct device *dev, +static int __power_supply_find_supply_from_node(struct power_supply *epsy, void *data) { struct device_node *np =3D data; - struct power_supply *epsy =3D dev_get_drvdata(dev); =20 - /* returning non-zero breaks out of power_supply_for_each_device loop */ + /* returning non-zero breaks out of power_supply_for_each_psy loop */ if (epsy->of_node =3D=3D np) return 1; =20 @@ -246,16 +243,16 @@ static int power_supply_find_supply_from_node(struct = device_node *supply_node) int error; =20 /* - * power_supply_for_each_device() either returns its own errors or values + * power_supply_for_each_psy() either returns its own errors or values * returned by __power_supply_find_supply_from_node(). * * __power_supply_find_supply_from_node() will return 0 (no match) * or 1 (match). * - * We return 0 if power_supply_for_each_device() returned 1, -EPROBE_DEFE= R if + * We return 0 if power_supply_for_each_psy() returned 1, -EPROBE_DEFER if * it returned 0, or error as returned by it. */ - error =3D power_supply_for_each_device(supply_node, __power_supply_find_s= upply_from_node); + error =3D power_supply_for_each_psy(supply_node, __power_supply_find_supp= ly_from_node); =20 return error ? (error =3D=3D 1 ? 0 : error) : -EPROBE_DEFER; } @@ -340,10 +337,9 @@ struct psy_am_i_supplied_data { unsigned int count; }; =20 -static int __power_supply_am_i_supplied(struct device *dev, void *_data) +static int __power_supply_am_i_supplied(struct power_supply *epsy, void *_= data) { union power_supply_propval ret =3D {0,}; - struct power_supply *epsy =3D dev_get_drvdata(dev); struct psy_am_i_supplied_data *data =3D _data; =20 if (__power_supply_is_supplied_by(epsy, data->psy)) { @@ -361,7 +357,7 @@ int power_supply_am_i_supplied(struct power_supply *psy) struct psy_am_i_supplied_data data =3D { psy, 0 }; int error; =20 - error =3D power_supply_for_each_device(&data, __power_supply_am_i_supplie= d); + error =3D power_supply_for_each_psy(&data, __power_supply_am_i_supplied); =20 dev_dbg(&psy->dev, "%s count %u err %d\n", __func__, data.count, error); =20 @@ -372,10 +368,9 @@ int power_supply_am_i_supplied(struct power_supply *ps= y) } EXPORT_SYMBOL_GPL(power_supply_am_i_supplied); =20 -static int __power_supply_is_system_supplied(struct device *dev, void *dat= a) +static int __power_supply_is_system_supplied(struct power_supply *psy, voi= d *data) { union power_supply_propval ret =3D {0,}; - struct power_supply *psy =3D dev_get_drvdata(dev); unsigned int *count =3D data; =20 if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_SCOPE, &ret)) @@ -396,7 +391,7 @@ int power_supply_is_system_supplied(void) int error; unsigned int count =3D 0; =20 - error =3D power_supply_for_each_device(&count, __power_supply_is_system_s= upplied); + error =3D power_supply_for_each_psy(&count, __power_supply_is_system_supp= lied); =20 /* * If no system scope power class device was found at all, most probably = we @@ -415,9 +410,8 @@ struct psy_get_supplier_prop_data { union power_supply_propval *val; }; =20 -static int __power_supply_get_supplier_property(struct device *dev, void *= _data) +static int __power_supply_get_supplier_property(struct power_supply *epsy,= void *_data) { - struct power_supply *epsy =3D dev_get_drvdata(dev); struct psy_get_supplier_prop_data *data =3D _data; =20 if (__power_supply_is_supplied_by(epsy, data->psy)) @@ -442,7 +436,7 @@ int power_supply_get_property_from_supplier(struct powe= r_supply *psy, * This function is not intended for use with a supply with multiple * suppliers, we simply pick the first supply to report the psp. */ - ret =3D power_supply_for_each_device(&data, __power_supply_get_supplier_p= roperty); + ret =3D power_supply_for_each_psy(&data, __power_supply_get_supplier_prop= erty); if (ret < 0) return ret; if (ret =3D=3D 0) --=20 2.47.1