| Message ID | 20240813103904.75978-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] nfc: mrvl: use scoped device node handling to simplify cleanup | expand |
On Tue, Aug 13, 2024 at 12:39:04PM +0200, Krzysztof Kozlowski wrote: > Obtain the device node reference with scoped/cleanup.h to reduce error > handling and make the code a bit simpler. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Simon Horman <horms@kernel.org>
On Tue, 13 Aug 2024 12:39:04 +0200 Krzysztof Kozlowski wrote: > - matched_node = of_get_compatible_child(node, "marvell,nfc-uart"); > + struct device_node *matched_node __free(device_node) = of_get_compatible_child(node, > + "marvell,nfc-uart"); The 100+ character line mixing declaration and code is more than I can bear. Sorry.
On 16/08/2024 04:08, Jakub Kicinski wrote: > On Tue, 13 Aug 2024 12:39:04 +0200 Krzysztof Kozlowski wrote: >> - matched_node = of_get_compatible_child(node, "marvell,nfc-uart"); >> + struct device_node *matched_node __free(device_node) = of_get_compatible_child(node, >> + "marvell,nfc-uart"); > > The 100+ character line mixing declaration and code is more than > I can bear. Sorry. If by mixing you mean declaration not on top of the code, that's the preferred style for __free() usage, as expressed by Linus. Constructor and destructor in one place. The 100 line, can be solved with wrapping after '=', but of course it is not particularly pretty. Let's drop the patch then. Best regards, Krzysztof
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c index 956ae92f7573..01760f92e68a 100644 --- a/drivers/nfc/nfcmrvl/uart.c +++ b/drivers/nfc/nfcmrvl/uart.c @@ -5,6 +5,7 @@ * Copyright (C) 2015, Marvell International Ltd. */ +#include <linux/cleanup.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/of_gpio.h> @@ -59,10 +60,10 @@ static const struct nfcmrvl_if_ops uart_ops = { static int nfcmrvl_uart_parse_dt(struct device_node *node, struct nfcmrvl_platform_data *pdata) { - struct device_node *matched_node; int ret; - matched_node = of_get_compatible_child(node, "marvell,nfc-uart"); + struct device_node *matched_node __free(device_node) = of_get_compatible_child(node, + "marvell,nfc-uart"); if (!matched_node) { matched_node = of_get_compatible_child(node, "mrvl,nfc-uart"); if (!matched_node) @@ -72,15 +73,12 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node, ret = nfcmrvl_parse_dt(matched_node, pdata); if (ret < 0) { pr_err("Failed to get generic entries\n"); - of_node_put(matched_node); return ret; } pdata->flow_control = of_property_read_bool(matched_node, "flow-control"); pdata->break_control = of_property_read_bool(matched_node, "break-control"); - of_node_put(matched_node); - return 0; }
Obtain the device node reference with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/nfc/nfcmrvl/uart.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)