From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
To: Marcel Holtmann <marcel@holtmann.org>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
Javier Carrasco <javier.carrasco.cruz@gmail.com>
Subject: [PATCH 2/2] Bluetooth: btbcm: automate node cleanup in btbcm_get_board_name()
Date: Wed, 30 Oct 2024 16:46:22 +0100 [thread overview]
Message-ID: <20241030-bluetooth-btbcm-node-cleanup-v1-2-fdc4b9df9fe3@gmail.com> (raw)
In-Reply-To: <20241030-bluetooth-btbcm-node-cleanup-v1-0-fdc4b9df9fe3@gmail.com>
Switch to a more robust approach by automating the node release when it
goes out of scope, removing the need for explicit calls to
of_node_put().
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
---
drivers/bluetooth/btbcm.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 400c2663d6b0..a1153ada74d2 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -541,23 +541,19 @@ static const struct bcm_subver_table bcm_usb_subver_table[] = {
static const char *btbcm_get_board_name(struct device *dev)
{
#ifdef CONFIG_OF
- struct device_node *root;
+ struct device_node *root __free(device_node) = of_find_node_by_path("/");
char *board_type;
const char *tmp;
- root = of_find_node_by_path("/");
if (!root)
return NULL;
- if (of_property_read_string_index(root, "compatible", 0, &tmp)) {
- of_node_put(root);
+ if (of_property_read_string_index(root, "compatible", 0, &tmp))
return NULL;
- }
/* get rid of any '/' in the compatible string */
board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
strreplace(board_type, '/', '-');
- of_node_put(root);
return board_type;
#else
--
2.43.0
next prev parent reply other threads:[~2024-10-30 15:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-30 15:46 [PATCH 0/2] Bluetooth: btbcm: fix missing of_node_put() in btbcm_get_board_name() Javier Carrasco
2024-10-30 15:46 ` [PATCH 1/2] " Javier Carrasco
2024-10-30 15:46 ` Javier Carrasco [this message]
2024-10-31 11:08 ` [PATCH 2/2] Bluetooth: btbcm: automate node cleanup " Krzysztof Kozlowski
2024-10-31 11:10 ` Javier Carrasco
2024-10-31 11:14 ` Krzysztof Kozlowski
2024-10-31 11:29 ` Javier Carrasco
2024-10-31 11:33 ` Krzysztof Kozlowski
2024-10-31 11:44 ` Krzysztof Kozlowski
2024-10-31 11:30 ` Krzysztof Kozlowski
2024-10-31 11:41 ` Javier Carrasco
2024-10-31 11:46 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241030-bluetooth-btbcm-node-cleanup-v1-2-fdc4b9df9fe3@gmail.com \
--to=javier.carrasco.cruz@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox