From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 9044C7EF1C for ; Mon, 29 Apr 2024 14:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402259; cv=none; b=W2vQuuUgYmv1IwuDTXczFpWDBXCfnYl9U4V3MR6sWNKgLooCZCvFYFLu16R0/9GNAju+LqIVGYZWShQhAsQFEqOnAydh6eaNEHk50rndvZO1PuqlAS1+EHek8/tWo3QSQ0yC1+7jtw+axlspVvC71ppafmZGDWt/FXfgcVywN0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402259; c=relaxed/simple; bh=ta4hw3RJe3RLJyhrYAahLj+IfUyV8pprABjjd5hupD0=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=GABZahlPAEaa3vmEKbZtTUovMqD6IkAAg/Pcgc3JzUgT6CkvF587c2sbp3Ktw+rsX00MA4Wb2blT7H9+ag1p1/96cb+o8fcS0Ykw5iQRzFa6qHxvmh+Vx/jI0f1GWeeEHHc3XC/cEtVZV/v2Z8g6qyeHhc49xzVZJtV3RdTroNA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=R/pc/Wc+; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="R/pc/Wc+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401927; bh=ta4hw3RJe3RLJyhrYAahLj+IfUyV8pprABjjd5hupD0=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=R/pc/Wc+3xgD24HE1IGkzNHeLQarLD6Dsr3hEkxHFYqDW0dM7fd29VYL3Xk0IfEVq u8XdiNBTA9LNRyymrwKSZyRqlGMGKcbARbrTK3kv7tda+NKtoixGcVBQ8IFIbq5+Ev nmuyOBTf0RtDfIvmbj3tIC7YyCRPrUOmeUu9HIyGhP0U0W4sFyKGyNiz13VGTg/54H O23z1nsQ6zTkGuTTA4wJmJbwTVjMk0tkFu1fjNOf/bxuHSdR8v0hhWy1AgAbhQc/Fo DH32ieTI2bMg20Fsv7oUyMDx323yUmA/ehB11iBhIwjjtOOhr92k7NKcYqFhioVXYB wv2jIrtEb36Mg== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMq5ftlz8k; Mon, 29 Apr 2024 16:45:27 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:27 +0200 Message-Id: <2680c3b712b36a3ddc279b7efcd87dbf2f24ccaf.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 01/12] regulator/core: _regulator_get: simplify error returns 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Remove unnecessary stores to `regulator`. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index dabac9772741..62dd3ac19e6d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2222,15 +2222,13 @@ struct regulator *_regulator_get(struct device *dev= , const char *id, } =20 if (rdev->exclusive) { - regulator =3D ERR_PTR(-EPERM); put_device(&rdev->dev); - return regulator; + return ERR_PTR(-EPERM); } =20 if (get_type =3D=3D EXCLUSIVE_GET && rdev->open_count) { - regulator =3D ERR_PTR(-EBUSY); put_device(&rdev->dev); - return regulator; + return ERR_PTR(-EBUSY); } =20 mutex_lock(®ulator_list_mutex); @@ -2238,32 +2236,28 @@ struct regulator *_regulator_get(struct device *dev= , const char *id, mutex_unlock(®ulator_list_mutex); =20 if (ret !=3D 0) { - regulator =3D ERR_PTR(-EPROBE_DEFER); put_device(&rdev->dev); - return regulator; + return ERR_PTR(-EPROBE_DEFER); } =20 ret =3D regulator_resolve_supply(rdev); if (ret < 0) { - regulator =3D ERR_PTR(ret); put_device(&rdev->dev); - return regulator; + return ERR_PTR(ret); } =20 if (!try_module_get(rdev->owner)) { - regulator =3D ERR_PTR(-EPROBE_DEFER); put_device(&rdev->dev); - return regulator; + return ERR_PTR(-EPROBE_DEFER); } =20 regulator_lock(rdev); regulator =3D create_regulator(rdev, dev, id); regulator_unlock(rdev); if (regulator =3D=3D NULL) { - regulator =3D ERR_PTR(-ENOMEM); module_put(rdev->owner); put_device(&rdev->dev); - return regulator; + return ERR_PTR(-ENOMEM); } =20 rdev->open_count++; --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 904087EF18 for ; Mon, 29 Apr 2024 14:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402259; cv=none; b=haRX6ME3VkKmlvnQ/5zpo2iXA1F8jyY34G1/Eub1tKoShXe25M4TNicWxJadQAWtCwe7OqZz05PaubpIfQRDf2iFpS4SSPwSFqtnf7FMZhxnbJ0GBQQ4UneO/aYqsywUofFAZkS9eABANn6i4e1KEkjcDTc9QcR1WTy9DbvFMtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402259; c=relaxed/simple; bh=LPUEFAe2CFZFvNUk6/2zfnIXl6UTcgi77ORqhlB5NFU=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=MZnbEX1YKvRm252++bu7POu7XWUqoIMJ4Gx4vnwDciS1p+CP1MYXND9WUCbvaDbDEOcHRb+qS0z5PV4l5jFjN+5PSpNbvrUQrLf4C4xD3Lvzwn/lG0qhEFM3kfxPo8p8flQEwrBhTHkHsl/I6ZajSd8VVyDvhVrCkRSnhsvN8X8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=CXNBUgdO; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="CXNBUgdO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401928; bh=LPUEFAe2CFZFvNUk6/2zfnIXl6UTcgi77ORqhlB5NFU=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=CXNBUgdOn5PNXgtyDNwXHO8yQOrEkUxX54+HLpUqqlmPCxNpmwaO4VcqfAGzitumj kMM5ltDX112P8EZk7MFGls3nhyXJfeysaS1C5DXOir5WwYRJQNTsOPeH8SwrTjsJil mnCcRq1nZd2X0FNGxsZd8xfDXdyhvLrKGbEC/g3ahNDVr9CbUuGpW+rqZkBDwMa5S+ rxtxcee5ggpTAKmyCrkmKryRC/qY4V4QOkaRIs+YVqCDffKcY6zU03+hrs1Avpl7qP 70ULbKdGL5+YBiSjD6IOORV1mbCgIQpTNvAhMVr2yYSjmSmyqbmFtaIu62fWrvJft/ Nii0ChNLj3/Wg== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMr0vyHzBL; Mon, 29 Apr 2024 16:45:28 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:27 +0200 Message-Id: <17f0bcb197b82e6a7bd8860178a363c96f85572d.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 02/12] regulator/core: set_consumer_device_supply: remove `has_dev` 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org `has_dev` is only ever used once to check if the name is non-NULL. Inline the check and make the intent obvious. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 62dd3ac19e6d..5db3bf08145c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1738,16 +1738,10 @@ static int set_consumer_device_supply(struct regula= tor_dev *rdev, const char *supply) { struct regulator_map *node, *new_node; - int has_dev; =20 if (supply =3D=3D NULL) return -EINVAL; =20 - if (consumer_dev_name !=3D NULL) - has_dev =3D 1; - else - has_dev =3D 0; - new_node =3D kzalloc(sizeof(struct regulator_map), GFP_KERNEL); if (new_node =3D=3D NULL) return -ENOMEM; @@ -1755,7 +1749,7 @@ static int set_consumer_device_supply(struct regulato= r_dev *rdev, new_node->regulator =3D rdev; new_node->supply =3D supply; =20 - if (has_dev) { + if (consumer_dev_name !=3D NULL) { new_node->dev_name =3D kstrdup(consumer_dev_name, GFP_KERNEL); if (new_node->dev_name =3D=3D NULL) { kfree(new_node); --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 6D0207EEF2 for ; Mon, 29 Apr 2024 14:55:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402558; cv=none; b=qmbWJdHci7XZ+aRAYyKqqEeNxk1B/uMFIE7IJVAXJMmNaHSLVy8AMxZwV6i/ZaqUiTFh+xo/jeqePhFg0X+HcBFu2+SJp6yFlXs88Uk8NqZQa+X9VYDJOgQAO4JcxA3AJ4twMFZ+4B3RNp/CzNIzRzCTP/ko1Vu0qtShWj4rPmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402558; c=relaxed/simple; bh=cCS+DVLBcUHkUuYmcqkFBMezGuTJlFBBRX3YxppQm40=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=fryk4p6L2NSo51AKjG1i22sGgXoY9itqL3Etb5bDPSMy/eFAf8uEF0HZe7KMZEXnzyhAWMf4D6RQ3pL3GzNn3DH7pg6+1u77qNxCSUxlRmQ0NkVKiAOrTizacVPpfWCwwx/3loHlJ/e0TMXuQW7M/hnRiZEnwPAjNdge43yRAdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=OuEMaWs/; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="OuEMaWs/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401928; bh=cCS+DVLBcUHkUuYmcqkFBMezGuTJlFBBRX3YxppQm40=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=OuEMaWs/7pg3zJyycDLH8eqqRUDlq91Rjfc35++RcaAXUaxMaDHlQNl4iwWeb5sCs h9AY335esHMkvPbm4Q+uo5PIy1ZzCOw5oD123CbkFuaP10Bk3uP6DfE/OYFT4CHcqC 91BemroiHoJCZwDXJdLA9Ubj5TSm9WAB7cltUkxYolEaeejAzBb8n51P3d31hIXQ7L OfiKEA7P1qzeyhML7P6QN/m53IXqpMN6YtPcoOcAlXNgzhdwczfQSvvZ0co09Hwkbx 2qJpJqvE6ufCkDLzypjtDACzeoEdFt/aB1vY9A9mlLIST9LgxBRQtcjev+syCTUFf6 6Ti2RcRrPYaWg== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMr3f1NzCW; Mon, 29 Apr 2024 16:45:28 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:28 +0200 Message-Id: <079287cf3922f3b38a4f751f6e9097816037dd8e.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 03/12] regulator/core: of_get_child_regulator: remove goto 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Because of_node_put() handles NULL properly (like kfree() et al) we can call it also after the loop ends (due to child =3D=3D NULL). This makes the gotos redundant. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5db3bf08145c..3d7147fabbed 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -438,18 +438,15 @@ static struct device_node *of_get_child_regulator(str= uct device_node *parent, =20 for_each_child_of_node(parent, child) { regnode =3D of_parse_phandle(child, prop_name, 0); + if (regnode) + break; =20 - if (!regnode) { - regnode =3D of_get_child_regulator(child, prop_name); - if (regnode) - goto err_node_put; - } else { - goto err_node_put; - } + regnode =3D of_get_child_regulator(child, prop_name); + if (regnode) + break; } - return NULL; =20 -err_node_put: + /* Release the node if the loop was exited early. */ of_node_put(child); return regnode; } --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 903CD7EEF3 for ; Mon, 29 Apr 2024 14:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402258; cv=none; b=cVQuoY9fUNDsLf558abJ7UZLFXvVAxjEcW8L6NthFR2Aoje/VzZH2R3/x+MfxYA+N81fsJuTAY8FjAuoGnTNNqcpKYQjdskkfl1AAK1Y6aMlXjt/qgYJmggCezSwllMdB/GVQ8i7gnJ0sB5tcq98C2bPDUZKsG0E5VQIEi9j8YI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714402258; c=relaxed/simple; bh=27EreRFOAHgU+jSBmIoV3nR5fKGUFarI3dQ5IBk0P9Y=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=fMEGeHx8N+hYYWYV9u43pl4bqUYZEDH4+2UikEXKaB/ic4oOId2mMAoltirH9Zp3IkRuATpjaHMqXb9rA5ohJ2b67lVmCCP8c6YKwl3Dh/ZonfYdG6yrXiI3+6fK2YI/seTn3KOisx487+FXZivEJKCtV4uDYzCu/ox1wcG2m9Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=cR4NfQRT; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="cR4NfQRT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401928; bh=27EreRFOAHgU+jSBmIoV3nR5fKGUFarI3dQ5IBk0P9Y=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=cR4NfQRTMafP5SvYwBsJ4ywJrRbJF/UMVO1dqiIyf05cBx0AOZyjb1+Wax5LgjEqW W9yeY/RBnAs81MwnUuuMpzq8zfCcFkx7b0BQdlLuuWbTz/kVbCUoO58CapcRgUeo9l mw7lTUgWx5NnaW0He+0pQZeNv5JkXvgsWKEauYjbl4DkKUhGqXMGuS99mynmETeh5T +3bNgTQO7mLnACD5+bZDDT1QriOuRYbn7xKoB6xKC3+urr/tl31WHndV7Q0FP8cNOD Xbgil78aH0OrlbVvWb/AMRzCpdbdgil8lAz0XdlVBPgFHFa3fRujQLw/FnDmPXsLM9 emHodgmZwjqgQ== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMr60flzDJ; Mon, 29 Apr 2024 16:45:28 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:28 +0200 Message-Id: <1ec1a8090c0e316ee005629c24f2779211e0aebf.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 04/12] regulator/core: regulator_bulk_get: remove redundant NULL stores 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org On error, callers of regulator_bulk_get() pass the error up and don't use the pointers in consumers[]. The function is documented to release all regulators if any request fails. Note: if an i-th regulator_get() failed only the i-th pointer was cleared. This is another suggestion that the clearing was unnecessary. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 3d7147fabbed..a1573a7ff2b2 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4872,11 +4872,7 @@ static int _notifier_call_chain(struct regulator_dev= *rdev, int _regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers, enum regulator_get_type get_type) { - int i; - int ret; - - for (i =3D 0; i < num_consumers; i++) - consumers[i].consumer =3D NULL; + int ret, i; =20 for (i =3D 0; i < num_consumers; i++) { consumers[i].consumer =3D _regulator_get(dev, @@ -4885,7 +4881,6 @@ int _regulator_bulk_get(struct device *dev, int num_c= onsumers, ret =3D dev_err_probe(dev, PTR_ERR(consumers[i].consumer), "Failed to get supply '%s'", consumers[i].supply); - consumers[i].consumer =3D NULL; goto err; } =20 --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 BBE5780630 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401942; cv=none; b=MysiyK6O1QSwB6h6VBoNwh+Qt8zxB6Bpi4BEThgGq7kElAY1e3BU2o1Mj9wzNP3dhGCZaLVEmUleZanqAcbeNgn4+jIVU/mbR02jvVJv/leQ5jFcxCVPaEnnFLZAKtbuRfBxDX7vwqUWfxg2dkgJaXpqUKpsE5jxRrQ6EHDMvZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401942; c=relaxed/simple; bh=k7yssPLl4cYxHXyuaFfTk1eIg9XDOAgEkwYZs+A/6+Y=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=Upo9rjNLD8poYag7dp059SOqFWtZ+ziX96y2XY2AF4bmI11mGNzq9B90EWyNqHxFyzZ3VUMyRLUM8WLlwe92xdstpc1PTnSfRMphyj2xdFDVu5EvFkb8/h6P1wUplS4cYa3xu+gIBgc6mKGad91I77PTq5KJsBN2gLpaFYD6P0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=K/6yZKWl; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="K/6yZKWl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401929; bh=k7yssPLl4cYxHXyuaFfTk1eIg9XDOAgEkwYZs+A/6+Y=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=K/6yZKWlXnXuIAKoHr8Up9gv8Xr1P9W4PDTG7JgJoiRBvl00GyLGx8jdDUfHnFTlb JgIFTglD3fLXds8DHiufcvT4RF9DF7XNXdtsnT+sCLJEGzXLnjKWGpV3iytmFBJK3w yASZcniKZ8d9qgxf0S3xMjICRi7clmRUQ7AE1bpedNPviPbsskDL80xX7GaxD6sVn7 zAdS4iP6GBOYaDqSQxq6xwUyoICJ7D8oK0LWN240MPqhk8wuCsOJvqx/9XBWkVZXEf hJl3MhDbym+ZaSEWl7N2V9ZP4jt9j1sium6WqLffrI74nLhK0OsLGcqXLfsPo0l95v sXjXGztBpywKg== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMs287zzFK; Mon, 29 Apr 2024 16:45:29 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:29 +0200 Message-Id: <43306deb3b0200298dded485bfa4057f37f1e7a5.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 05/12] regulator/core: regulator_ena_gpio_ctrl: pull in ena_gpio state handling 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Deduplicate `ena_gpio_state` handling by pulling it into regulator_ena_gpio_ctrl(). Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a1573a7ff2b2..4cb30e49c03d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2625,6 +2625,10 @@ static int regulator_ena_gpio_ctrl(struct regulator_= dev *rdev, bool enable) if (!pin) return -EINVAL; =20 + if (rdev->ena_gpio_state =3D=3D enable) + return 0; + rdev->ena_gpio_state =3D enable; + if (enable) { /* Enable GPIO at initial use */ if (pin->enable_count =3D=3D 0) @@ -2744,12 +2748,9 @@ static int _regulator_do_enable(struct regulator_dev= *rdev) } =20 if (rdev->ena_pin) { - if (!rdev->ena_gpio_state) { - ret =3D regulator_ena_gpio_ctrl(rdev, true); - if (ret < 0) - return ret; - rdev->ena_gpio_state =3D 1; - } + ret =3D regulator_ena_gpio_ctrl(rdev, true); + if (ret < 0) + return ret; } else if (rdev->desc->ops->enable) { ret =3D rdev->desc->ops->enable(rdev); if (ret < 0) @@ -2963,13 +2964,9 @@ static int _regulator_do_disable(struct regulator_de= v *rdev) trace_regulator_disable(rdev_get_name(rdev)); =20 if (rdev->ena_pin) { - if (rdev->ena_gpio_state) { - ret =3D regulator_ena_gpio_ctrl(rdev, false); - if (ret < 0) - return ret; - rdev->ena_gpio_state =3D 0; - } - + ret =3D regulator_ena_gpio_ctrl(rdev, false); + if (ret < 0) + return ret; } else if (rdev->desc->ops->disable) { ret =3D rdev->desc->ops->disable(rdev); if (ret !=3D 0) --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 B923A7EF18 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; cv=none; b=sB4pmJsrrKbwlBCW5fmdgKZnjDjNmqzFrbfTuM1ANwvYhuCXfxElUTCqz3mdvwWvTbJWG8wPrUtVaEslWJoWkStGsQRIofRRBe2puEUy82LdbeV9vaM9Nt92aZvzN0s9bHNqx1qlz53Z7cj7CyEeVKgVaV7/68yWOe7nKCnG9jU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; c=relaxed/simple; bh=VgBNW+KxT7+rgLFryVkEDoWc1+7GQwAEoJRu2QC0sx4=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=QIsaWM3VA/fkpN6Gh5uCsgTLnQjjGuoWhgPUt8mqMjFGEkYwP+Fx9qH6sRmz1NWkP76Mh5Ux7YLKLMn/oskjRMenWjo1vkTT8tMqmLG8x4eqFHWC4uYRVmtNZVrz7sLXeZfqvU5VzZJtMSSvEJhJpgLVW9TEocW4Eyr7BBHzpQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=qkSLMEwh; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="qkSLMEwh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401930; bh=VgBNW+KxT7+rgLFryVkEDoWc1+7GQwAEoJRu2QC0sx4=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=qkSLMEwhPh9Cx193H1xCghs8GC2tPDH04D8kAJUKmPTYsZUrvIAiFquMvxb6BQ0AM nbEcqRRBfZt3+2laeih6pEbZX/0BXXxqxBM1lhfEUT/qLOtUHn87iPPv6+1OzSqB2I YzsDVFKkOojnyBtEJ3mlwg3a0iCHRTnj10oT9aZqhtmn33oHnDwEmlkR0UT7ibqTyj ZURO2As//UBNR7MbiWbbRF7cX9X3yLA8hym/3V5kbJnfIFQSKq+Tha5u6WrhlRTT3v hei0dV7CmK8mJpBj3C0MufuE+fFEkitVeOIrneZCF4kap4ddBW8KqdaXtU6nOteOcI 5LC6fyr8oyjFA== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMs6XZBzKb; Mon, 29 Apr 2024 16:45:29 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:29 +0200 Message-Id: <799e847ea819c9972d4c0b6a7f427a41ff652412.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 06/12] regulator/core: remove regulator_init callback 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org There are no in-tree users. The only usage went away in 2019 in 8c44e448583c ("regulator: stpmic1: Simplify regulators registration"). Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 7 ------- include/linux/regulator/machine.h | 7 ++----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 4cb30e49c03d..be45983e1d23 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5679,13 +5679,6 @@ regulator_register(struct device *dev, resolved_early =3D true; } =20 - /* perform any regulator specific init */ - if (init_data && init_data->regulator_init) { - ret =3D init_data->regulator_init(rdev->reg_data); - if (ret < 0) - goto wash; - } - if (config->ena_gpiod) { ret =3D regulator_ena_gpio_request(rdev, config); if (ret !=3D 0) { diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/ma= chine.h index 0cd76d264727..7c39dbc33290 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -274,8 +274,7 @@ struct regulator_consumer_supply { * @num_consumer_supplies: Number of consumer device supplies. * @consumer_supplies: Consumer device supply configuration. * - * @regulator_init: Callback invoked when the regulator has been registere= d. - * @driver_data: Data passed to regulator_init. + * @driver_data: Pointer copied to regulator_dev.reg_data. */ struct regulator_init_data { const char *supply_regulator; /* or NULL for system supply */ @@ -285,9 +284,7 @@ struct regulator_init_data { int num_consumer_supplies; struct regulator_consumer_supply *consumer_supplies; =20 - /* optional regulator machine specific init */ - int (*regulator_init)(void *driver_data); - void *driver_data; /* core does not touch this */ + void *driver_data; }; =20 #ifdef CONFIG_REGULATOR --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 B7A7D7EF04 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; cv=none; b=I9JNxhxv4ukCP/cruzwmWnHbrMSJN8FE+xxcp5dxHp+OQSD6wpH9m+s+vNK9zUtRNNXOpe3wOMRl00gPAty3Fyxrtj2P1bTKLrnlqvwePFQKlAC985E2/U/taf5Ubofgwedw2nOAmKey8xRBiY9RW4wysF7vVcAd4ZzYlON03rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; c=relaxed/simple; bh=ALJ3a2lN8gTuNkfwOUbs2XXgVwKG43Au7jQay+z9jLo=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=HdmWb83yvYiRXuSG9CmU02+QSSQQdXM/oG3YbH1peP3OWvLipJ5RqLQnwtSFns3VmbvWhYYWqAyeqQkgaPGZADwNOLffopbgqmdF1khe1Z0lDpLLz4j8CkNrQHgswQkyavCTIkEnU/JYX9s7LNMXCFYJKd5e4LCCYI4393TxR74= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=o8cd8ajn; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="o8cd8ajn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401930; bh=ALJ3a2lN8gTuNkfwOUbs2XXgVwKG43Au7jQay+z9jLo=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=o8cd8ajnyyhrxSSiD6U8g8JnpFXWWK1pMOxNyh2Zt29WreK2PQn6jaT//0yEPloDJ WEzM5EzOKqWWqwuXx1+tpvB7yMtRvqL4oBK2GisXxWXklzKYUQNOFvVQEeDmmhQk4i cJBMDRLT8skn6uETl37+G5lErxMi3oSNcPsVL2NSgQ0bQxpZ2lTypVL1Y5fheVmzeJ tcp9IEmcIdoqN8RaKZFMrTyhSJEq31yOj+ZdUK1cxj67yvt0b0wlKAKS6s+g04bMeo EFtrHsqq8JbuK9RV2BMp5F7RKJ7JqdzeYLxq2N4jSCoIQzYGZ7JuWWdR3jJh3hNIo5 vdqOfwiw35ueQ== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMt5bqlzPG; Mon, 29 Apr 2024 16:45:30 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:30 +0200 Message-Id: <80d42ba84110eb04d451f832ba6033955aba90fa.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 07/12] regulator/core: remove regulator_get_init_drvdata() 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org There are no in-tree users. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 6 ------ include/linux/regulator/driver.h | 1 - 2 files changed, 7 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index be45983e1d23..efb68a5c85af 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5955,12 +5955,6 @@ struct regmap *rdev_get_regmap(struct regulator_dev = *rdev) } EXPORT_SYMBOL_GPL(rdev_get_regmap); =20 -void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data) -{ - return reg_init_data->driver_data; -} -EXPORT_SYMBOL_GPL(regulator_get_init_drvdata); - #ifdef CONFIG_DEBUG_FS static int supply_map_show(struct seq_file *sf, void *data) { diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/dri= ver.h index 22a07c0900a4..c1334601cf02 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -753,7 +753,6 @@ int regulator_set_active_discharge_regmap(struct regula= tor_dev *rdev, int regulator_set_current_limit_regmap(struct regulator_dev *rdev, int min_uA, int max_uA); int regulator_get_current_limit_regmap(struct regulator_dev *rdev); -void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data= ); int regulator_find_closest_bigger(unsigned int target, const unsigned int = *table, unsigned int num_sel, unsigned int *sel); int regulator_set_ramp_delay_regmap(struct regulator_dev *rdev, int ramp_d= elay); --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 BA91180624 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401941; cv=none; b=jRCVTWr2rWMeGta7guolOr5kmlfEN91wvPxQbapSFIiQxpnHXVEs6yLpxBrqv8kiAUP4iaUVBhdiGbg5bXNPyPl+81gxcl7bcu5ZxbhYan8LnKTVKJ/eIvTM7qLOKJqcws3uhRCPP02Gr8QSKuzUgcInKQqyNaivGRN4Ze5Z/z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401941; c=relaxed/simple; bh=SQFjFnDvj4pBVC5wVcGxU/7jwPxTwAo0q5RMDCeQAH4=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=kfjsIT/5rW1V9Y8Nt2YtjVaJV9H+Nxew8V4Q32ZrtUpEr9Ai+gsN5yDbOOvuIVEMQvuk3fmyeWBrR+HZOQaUQXcKlb7Gf3ugQyVZnBRxyyzt7HhnzqU+U6VsAChf06DZ/kSP4PSQ1iVTdMEF2GtKM4SVx7gVrjVCZxFT1ODGFRc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=ff8RvQJf; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="ff8RvQJf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401931; bh=SQFjFnDvj4pBVC5wVcGxU/7jwPxTwAo0q5RMDCeQAH4=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=ff8RvQJfgPFfPn3n24LNh7YmnyyvRDaQfxk3WY6L3jXeNXHFfERWjsGno2mQ/BuJr YFuVwwptDS9hNmqExoO14nmqD6mpb4RTF6dsnSB3n6Ue1m2wWzquBec2KpCtScaDW1 Ts1XsxxhPbQNIa49oY6O8jMeZPEg81FsRfn5RUNpktsQ9Jse55xP4PlTkkW4TK/x5Z 0piKBUn5ngKrY65OK67wmi9LmpXNfX4VbuQerQ5RDSLW5qMFGCe/lX5g9C7qJwolJU KFYdGSkLlDwQUhA+YqdtGJk18CDz1olvhq++djjwxJGXgtlo21EnYYu6ngUh0c79MO rNp3uu+duAgdQ== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMv0rxTzbm; Mon, 29 Apr 2024 16:45:31 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:30 +0200 Message-Id: <92a354a86ceb572c4fde35047177c5681d83f81f.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 08/12] regulator/core: set_consumer_device_supply: avoid copying const data 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org As consumer_dev_name might as well be const, don't copy it if not required. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index efb68a5c85af..431e1c164b11 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1747,7 +1747,7 @@ static int set_consumer_device_supply(struct regulato= r_dev *rdev, new_node->supply =3D supply; =20 if (consumer_dev_name !=3D NULL) { - new_node->dev_name =3D kstrdup(consumer_dev_name, GFP_KERNEL); + new_node->dev_name =3D kstrdup_const(consumer_dev_name, GFP_KERNEL); if (new_node->dev_name =3D=3D NULL) { kfree(new_node); return -ENOMEM; @@ -1782,7 +1782,7 @@ static int set_consumer_device_supply(struct regulato= r_dev *rdev, =20 fail: mutex_unlock(®ulator_list_mutex); - kfree(new_node->dev_name); + kfree_const(new_node->dev_name); kfree(new_node); return -EBUSY; } @@ -1794,7 +1794,7 @@ static void unset_regulator_supplies(struct regulator= _dev *rdev) list_for_each_entry_safe(node, n, ®ulator_map_list, list) { if (rdev =3D=3D node->regulator) { list_del(&node->list); - kfree(node->dev_name); + kfree_const(node->dev_name); kfree(node); } } --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 B543A7EEF2 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401939; cv=none; b=ThKzgorVI5hgSDcY24CgY+XtNuGkhCX59kbihEM6aQL57lRxGysDB0Qs0Df8ub24C84mEpMWxzhD/9TeZw+tvYw7tWcklCPkhpGCNbA4Mbt8gUZKwwcoMhEN3bPzydiFtYJcY2gLe6S5tWEwRPqZSnWFdvuHTyTV4kT0iWVTB/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401939; c=relaxed/simple; bh=oAPaEdKRQbl/ibo90AYRSlwVYUinifQpfpKWtnOvN/A=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=AQu5p4RnIQ7DMjCMjIk5jTexyU9Bg44HKvj2svPPTVqmwij0usTHXe8umITztDvxObFyZrLC06LbbpYJ3ZivQ+XfiM8J6SaJ9Nq7HoJ3WH3wCGrxk1pruMOAvEtkUCSCwN8EZzNUb6YcO3LEgTcG/SYo7dmQS4h+s35W3vwTpR0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=FVCfwT2p; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="FVCfwT2p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401931; bh=oAPaEdKRQbl/ibo90AYRSlwVYUinifQpfpKWtnOvN/A=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=FVCfwT2pcWQbEzQZAKCwef4vL5Hp2sOFYIYwrvf+EHnhMljwfuPLC1XYCTS62fuiP iKmtyjgu0FrWUjNyIDqgb2HWVAt7HhIUGS5xZj5oxK7aPqSLy7pGhd3ZgEYIn0RLrb XG18UynlNtHlgxalBGlyamLWJpUiAucmgsHEpwKFNSGImkvCVMV3IWxnYnE6LkaWQG 2c/BlHV82yisJyfFmeteeajWxyN6Me94IT+bikBXLPKSM9EOqmInCgr81A7Xz6MRQ2 z27g70IlD5QEyrCs+AzugC1GyCtrCxPCqAkJCek9As/WwELskw8YbB2bNtDmzESQBf QbweTCQCQJAxw== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMv4mg6zbr; Mon, 29 Apr 2024 16:45:31 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:31 +0200 Message-Id: In-Reply-To: References: Subject: [PATCH v2 09/12] regulator/tps68470: use rdev_get_drvdata() 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Replace uses of rdev->reg_data with the official wrapper. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/tps68470-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/tps68470-regulator.c b/drivers/regulator/tps= 68470-regulator.c index de7db7690f6b..326a3b942488 100644 --- a/drivers/regulator/tps68470-regulator.c +++ b/drivers/regulator/tps68470-regulator.c @@ -56,7 +56,7 @@ static const struct linear_range tps68470_core_ranges[] = =3D { =20 static int tps68470_regulator_enable(struct regulator_dev *rdev) { - struct tps68470_regulator_data *data =3D rdev->reg_data; + struct tps68470_regulator_data *data =3D rdev_get_drvdata(rdev); int ret; =20 /* The Core buck regulator needs the PMIC's PLL to be enabled */ @@ -73,7 +73,7 @@ static int tps68470_regulator_enable(struct regulator_dev= *rdev) =20 static int tps68470_regulator_disable(struct regulator_dev *rdev) { - struct tps68470_regulator_data *data =3D rdev->reg_data; + struct tps68470_regulator_data *data =3D rdev_get_drvdata(rdev); =20 if (rdev->desc->id =3D=3D TPS68470_CORE) clk_disable_unprepare(data->clk); --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 BD44F80633 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401942; cv=none; b=jy2JancY3p+I1HPfJaMWnH+MmCiNWfFj0fBU8Qa+X8qM9uW11W1einQsSW8Fx62oEnmVp+71qsWs7G+UvzwNQ1IWf57RQ2IGL70pr3BKh60eVNzz1icjP3QsW1N7eopPtFqi0R++wuN+Z8vEzvCKBeDGvaJwh7hd/VC3x3Q25Xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401942; c=relaxed/simple; bh=XOjGi/2Lne6XOZ5e5aW/2dU32ukuNR6WyG/LG7Qn0N4=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=P9R4+SI4Vo505ZmPpeNzPDJjJeJ3goXAOYqsstp4sa1nvieZSk9j/xlucmJVE6ZmQth3R8tVyQswdLtGefY2aUoWSIN8SKAEB/drM0CZ5rAJ04+p9WxxyAjpgsvOOCG2f9rcyG76fe0wJ4tyVxSFNjVXqGpjlPmfyeVm8cdqw6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=UuMwGh6L; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="UuMwGh6L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401932; bh=XOjGi/2Lne6XOZ5e5aW/2dU32ukuNR6WyG/LG7Qn0N4=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=UuMwGh6LUoMayHam9P7nJfARkeY0zPPQJWQneeIFexxCFe/Su5sQFB1jEkeXKqbiR 9CM+rCS7457f6hH501JhBNeV+fnQZC+n+7UcBQMuCwofDMMoDfPJCVlrVG3gEpHrbf 1W/r13ev/HyAFRY3ij+R8ed6YnPWNwvuv+Rqvr2Psw00urBe5LQh2OlZ6ce0GFiraj GqVoU64kqcoGBTLg5nftioWxqGQN+EMexLOOdxDHCRZQrAIRRfDW6D91TCiMiCCNLW ui1jzJGhEoaWLT0mgpSqcJZrQTMZCtN2/S5/PWA2l5wOXOi2vxmYXOrRezsv36wqIG nB1L1LRoh1Jmw== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMw4JStzd3; Mon, 29 Apr 2024 16:45:32 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:32 +0200 Message-Id: <90c898494b540d51767a108574cf76b7477085e5.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 10/12] regulator/core: use dev_to_rdev() for device -> regulator_dev cast 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org There is 1:1 relationship between regulator_dev and device (rdev->dev) structures. Since we already have dev_to_rdev() to follow from &rdev->dev to the rdev, use it instead of dereferencing a pointer. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 431e1c164b11..d7192530d3e0 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -650,7 +650,7 @@ regulator_get_suspend_state_check(struct regulator_dev = *rdev, suspend_state_t st static ssize_t microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); int uV; =20 regulator_lock(rdev); @@ -666,7 +666,7 @@ static DEVICE_ATTR_RO(microvolts); static ssize_t microamps_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return sprintf(buf, "%d\n", _regulator_get_current_limit(rdev)); } @@ -675,7 +675,7 @@ static DEVICE_ATTR_RO(microamps); static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return sprintf(buf, "%s\n", rdev_get_name(rdev)); } @@ -704,7 +704,7 @@ static ssize_t regulator_print_opmode(char *buf, int mo= de) static ssize_t opmode_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_opmode(buf, _regulator_get_mode(rdev)); } @@ -723,7 +723,7 @@ static ssize_t regulator_print_state(char *buf, int sta= te) static ssize_t state_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); ssize_t ret; =20 regulator_lock(rdev); @@ -737,7 +737,7 @@ static DEVICE_ATTR_RO(state); static ssize_t status_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); int status; char *label; =20 @@ -784,7 +784,7 @@ static DEVICE_ATTR_RO(status); static ssize_t min_microamps_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 if (!rdev->constraints) return sprintf(buf, "constraint not defined\n"); @@ -796,7 +796,7 @@ static DEVICE_ATTR_RO(min_microamps); static ssize_t max_microamps_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 if (!rdev->constraints) return sprintf(buf, "constraint not defined\n"); @@ -808,7 +808,7 @@ static DEVICE_ATTR_RO(max_microamps); static ssize_t min_microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 if (!rdev->constraints) return sprintf(buf, "constraint not defined\n"); @@ -820,7 +820,7 @@ static DEVICE_ATTR_RO(min_microvolts); static ssize_t max_microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 if (!rdev->constraints) return sprintf(buf, "constraint not defined\n"); @@ -832,7 +832,7 @@ static DEVICE_ATTR_RO(max_microvolts); static ssize_t requested_microamps_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); struct regulator *regulator; int uA =3D 0; =20 @@ -849,7 +849,7 @@ static DEVICE_ATTR_RO(requested_microamps); static ssize_t num_users_show(struct device *dev, struct device_attribute = *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); return sprintf(buf, "%d\n", rdev->use_count); } static DEVICE_ATTR_RO(num_users); @@ -857,7 +857,7 @@ static DEVICE_ATTR_RO(num_users); static ssize_t type_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 switch (rdev->desc->type) { case REGULATOR_VOLTAGE: @@ -872,7 +872,7 @@ static DEVICE_ATTR_RO(type); static ssize_t suspend_mem_microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return sprintf(buf, "%d\n", rdev->constraints->state_mem.uV); } @@ -881,7 +881,7 @@ static DEVICE_ATTR_RO(suspend_mem_microvolts); static ssize_t suspend_disk_microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return sprintf(buf, "%d\n", rdev->constraints->state_disk.uV); } @@ -890,7 +890,7 @@ static DEVICE_ATTR_RO(suspend_disk_microvolts); static ssize_t suspend_standby_microvolts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return sprintf(buf, "%d\n", rdev->constraints->state_standby.uV); } @@ -899,7 +899,7 @@ static DEVICE_ATTR_RO(suspend_standby_microvolts); static ssize_t suspend_mem_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_opmode(buf, rdev->constraints->state_mem.mode); @@ -909,7 +909,7 @@ static DEVICE_ATTR_RO(suspend_mem_mode); static ssize_t suspend_disk_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_opmode(buf, rdev->constraints->state_disk.mode); @@ -919,7 +919,7 @@ static DEVICE_ATTR_RO(suspend_disk_mode); static ssize_t suspend_standby_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_opmode(buf, rdev->constraints->state_standby.mode); @@ -929,7 +929,7 @@ static DEVICE_ATTR_RO(suspend_standby_mode); static ssize_t suspend_mem_state_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_state(buf, rdev->constraints->state_mem.enabled); @@ -939,7 +939,7 @@ static DEVICE_ATTR_RO(suspend_mem_state); static ssize_t suspend_disk_state_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_state(buf, rdev->constraints->state_disk.enabled); @@ -949,7 +949,7 @@ static DEVICE_ATTR_RO(suspend_disk_state); static ssize_t suspend_standby_state_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 return regulator_print_state(buf, rdev->constraints->state_standby.enabled); @@ -959,7 +959,7 @@ static DEVICE_ATTR_RO(suspend_standby_state); static ssize_t bypass_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); const char *report; bool bypass; int ret; @@ -983,7 +983,7 @@ static DEVICE_ATTR_RO(bypass); { \ int ret; \ unsigned int flags; \ - struct regulator_dev *rdev =3D dev_get_drvdata(dev); \ + struct regulator_dev *rdev =3D dev_to_rdev(dev); \ ret =3D _regulator_get_error_flags(rdev, &flags); \ if (ret) \ return ret; \ @@ -5278,7 +5278,7 @@ static const struct attribute_group *regulator_dev_gr= oups[] =3D { =20 static void regulator_dev_release(struct device *dev) { - struct regulator_dev *rdev =3D dev_get_drvdata(dev); + struct regulator_dev *rdev =3D dev_to_rdev(dev); =20 debugfs_remove_recursive(rdev->debugfs); kfree(rdev->constraints); @@ -5588,7 +5588,6 @@ regulator_register(struct device *dev, goto rinse; } device_initialize(&rdev->dev); - dev_set_drvdata(&rdev->dev, rdev); rdev->dev.class =3D ®ulator_class; spin_lock_init(&rdev->err_lock); =20 --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 BE9DD80637 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; cv=none; b=biH7wKO1xwPRTDK4M05gEXnfQSxzYSsqO0Vqy3npZf8s6Rgd0EaR+uvWY6Ssr8iZkSG7N4mq/GF2ELSqEf4bu4JoaKZKOfQYXkAqq2UuWXJQrcvPUbTEsHD89arhO4OLy3rUMKQawJlGztdymn1YAmedo1gj3Lpjqwv6FepcTvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; c=relaxed/simple; bh=DmXR99HJmp8ntT6M7eWZkiJS2A4EI6AFe4l7VHsorYU=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=ex5RvKCN67jE1j6YRrYdHXUTHPjZoX4yuEW0PVfAEmsLHkQIMS5XOFvvIRCopAR3KW5X712k1htC+SuEZR7VQcFoSQE5BOWuqKhb99ZfnTwLlInLGYAFfbq90a7mVzcRTrfrwpBA1LgzpktoTSUI0bAO7zuGwU2a9RityIhhFEY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=KGMr4KWU; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="KGMr4KWU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401933; bh=DmXR99HJmp8ntT6M7eWZkiJS2A4EI6AFe4l7VHsorYU=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=KGMr4KWU9Epg0duIA8sCnxE6z2DBCDqjdqqYeyVyNM2JXuYHjdQWm5sFyqHQDSqzw 4Q2hGab7SCvh0HVk+885DV2/cS0qpdjjNPB1578yOx1UKnYYKmxZ0/EJ1mQCsGy0jS eQwaTrtUm8OLYxOXlf+jnN1dqfCGRnkEJRIBcpi31FMQRhpgWxSe1d7efzfSWxf27z qN50S6so7z3cmk924vaAnyj4JDhpRiM9FptmkCCqFOLT2QNzJlju6Zag4c2QPj97IL gfbYfLODHEfc94IqYuj2tyVIPgEYigRL+yP4xQpZUSyMhN4WiknucfDCATrDBkJ8rl beQvkYudK2ibA== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMx03SpzsP; Mon, 29 Apr 2024 16:45:33 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:32 +0200 Message-Id: <0c86e0d9585a4153049ac3eb0b9b8b1793a62e75.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 11/12] regulator/core: remove regulator_get/set_drvdata 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org There are no users of accessing regulator driver data via `struct regulator` and there shouldn't be any as the struct is representing a power consumer not the regulator itself. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 24 ------------------------ include/linux/regulator/consumer.h | 14 -------------- 2 files changed, 38 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d7192530d3e0..010f4db2ce60 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5908,30 +5908,6 @@ void *rdev_get_drvdata(struct regulator_dev *rdev) } EXPORT_SYMBOL_GPL(rdev_get_drvdata); =20 -/** - * regulator_get_drvdata - get regulator driver data - * @regulator: regulator - * - * Get regulator driver private data. This call can be used in the consumer - * driver context when non API regulator specific functions need to be cal= led. - */ -void *regulator_get_drvdata(struct regulator *regulator) -{ - return regulator->rdev->reg_data; -} -EXPORT_SYMBOL_GPL(regulator_get_drvdata); - -/** - * regulator_set_drvdata - set regulator driver data - * @regulator: regulator - * @data: data - */ -void regulator_set_drvdata(struct regulator *regulator, void *data) -{ - regulator->rdev->reg_data =3D data; -} -EXPORT_SYMBOL_GPL(regulator_set_drvdata); - /** * rdev_get_id - get regulator ID * @rdev: regulator diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/c= onsumer.h index 4660582a3302..ee84adba390a 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -268,10 +268,6 @@ int regulator_suspend_disable(struct regulator_dev *rd= ev, int regulator_set_suspend_voltage(struct regulator *regulator, int min_uV, int max_uV, suspend_state_t state); =20 -/* driver data - core doesn't touch */ -void *regulator_get_drvdata(struct regulator *regulator); -void regulator_set_drvdata(struct regulator *regulator, void *data); - /* misc helpers */ =20 void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, @@ -607,16 +603,6 @@ static inline int regulator_set_suspend_voltage(struct= regulator *regulator, return -EINVAL; } =20 -static inline void *regulator_get_drvdata(struct regulator *regulator) -{ - return NULL; -} - -static inline void regulator_set_drvdata(struct regulator *regulator, - void *data) -{ -} - static inline int regulator_count_voltages(struct regulator *regulator) { return 0; --=20 2.39.2 From nobody Fri Dec 19 02:50:49 2025 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) (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 B54797EEF3 for ; Mon, 29 Apr 2024 14:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.227.64.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; cv=none; b=NincPjF+qOtD+r1AaSQRanOn+o19WVbvMNolffhUmYcQ1JaLJl7ylk1rXPseI4i7A6+hM1NI0Ns8lWd+96YhYKsj0K0v3OMS/HT0uOSIz4KntILqOLQ/ByYOTtRVrnowC3rZGhuJq8+qCJK0ZJUM1VdM//Oc5atB63DG+Vuqy+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401940; c=relaxed/simple; bh=4JtJTSbLrjwGebjthC7c0OCkQzqG8Bgaqe/Z3Spl0fM=; h=Date:Message-Id:In-Reply-To:References:Subject:MIME-Version: Content-Type:From:To:Cc; b=ffQwr3jnjGxy8/E7oowSbNzAsAAwJinjIzDNsuiSekuKRXO71wRCifIDrJRnjNdf73LfCHrXP5fETGwN3/upiq1uvlRc7DzI77TgLLZoBUL5PmgfCIvynGWiSoHoEcKfdx2kEm+9zZSb4rHL/8YIqEkBMOUyK/CaWlAdRUUgUOA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl; spf=pass smtp.mailfrom=rere.qmqm.pl; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b=cNpCRKZT; arc=none smtp.client-ip=91.227.64.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rere.qmqm.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="cNpCRKZT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1714401933; bh=4JtJTSbLrjwGebjthC7c0OCkQzqG8Bgaqe/Z3Spl0fM=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=cNpCRKZTS4BT2Od/tQPePf91WPup7BuhEp3AVYFZFz9c5JCdKO4qRNMTCzKcgSe6D W0lWHX3wjCC0RUZB1bPj6nl5w4lKjtx0vLcB6MTI3Mq/zJjphah1DMDtgmcuHK8Tpy kHWfmXJl+WzlHiOmI0WYQfogbEErXjXmHhFQd8ueAEyjxMia03mPSkti3q2ZF+ZGZf bHFpPRfnMW8OePhcquVFtGNlPED7rPf0UobN8IEKueDi/xIIpMMIPIvbGrtYg835T2 3F+UeNrfT0hQXJNWZVCObFFLMZ5/ilZez1jZ32DD0qh30VxtJ8jWLKMytjt2JpU4un ZttaTsMPR1lBQ== Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4VSmMx487bz1M1; Mon, 29 Apr 2024 16:45:33 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.0.5 at mail Date: Mon, 29 Apr 2024 16:45:33 +0200 Message-Id: <0a480abe4913f0169f9693f6f959fbe1a397ae93.1714399603.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 12/12] regulator/core: use rdev->dev.driver_data 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 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Move rdev->reg_data to rdev->dev.driver_data to follow the linux device model more closely. Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 15 +-------------- include/linux/regulator/driver.h | 8 +++++--- include/linux/regulator/machine.h | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 010f4db2ce60..ea2a5efd9a4b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5630,7 +5630,7 @@ regulator_register(struct device *dev, } =20 ww_mutex_init(&rdev->mutex, ®ulator_ww_class); - rdev->reg_data =3D config->driver_data; + dev_set_drvdata(&rdev->dev, config->driver_data); rdev->owner =3D regulator_desc->owner; rdev->desc =3D regulator_desc; if (config->regmap) @@ -5895,19 +5895,6 @@ void regulator_has_full_constraints(void) } EXPORT_SYMBOL_GPL(regulator_has_full_constraints); =20 -/** - * rdev_get_drvdata - get rdev regulator driver data - * @rdev: regulator - * - * Get rdev regulator driver private data. This call can be used in the - * regulator driver context. - */ -void *rdev_get_drvdata(struct regulator_dev *rdev) -{ - return rdev->reg_data; -} -EXPORT_SYMBOL_GPL(rdev_get_drvdata); - /** * rdev_get_id - get regulator ID * @rdev: regulator diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/dri= ver.h index c1334601cf02..680c23b13249 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -632,8 +632,6 @@ struct regulator_dev { =20 struct delayed_work disable_work; =20 - void *reg_data; /* regulator_dev data */ - struct dentry *debugfs; =20 struct regulator_enable_gpio *ena_pin; @@ -707,7 +705,11 @@ void regulator_irq_helper_cancel(void **handle); int regulator_irq_map_event_simple(int irq, struct regulator_irq_data *rid, unsigned long *dev_mask); =20 -void *rdev_get_drvdata(struct regulator_dev *rdev); +static inline void *rdev_get_drvdata(const struct regulator_dev *rdev) +{ + return dev_get_drvdata(&rdev->dev); +} + struct device *rdev_get_dev(struct regulator_dev *rdev); struct regmap *rdev_get_regmap(struct regulator_dev *rdev); int rdev_get_id(struct regulator_dev *rdev); diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/ma= chine.h index 7c39dbc33290..378f051d4e70 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -274,7 +274,7 @@ struct regulator_consumer_supply { * @num_consumer_supplies: Number of consumer device supplies. * @consumer_supplies: Consumer device supply configuration. * - * @driver_data: Pointer copied to regulator_dev.reg_data. + * @driver_data: Pointer copied to regulator_dev's drvdata. */ struct regulator_init_data { const char *supply_regulator; /* or NULL for system supply */ --=20 2.39.2