[PATCH v3] media: i2c: ov5640: use scoped fwnode_handle endpoint cleanup
From: Biren Pandya
Date: Wed Jul 08 2026 - 08:50:20 EST
Utilize the __free(fwnode_handle) scoped guard macro from
<linux/cleanup.h> to automate the lifecycle management of the endpoint
fwnode in ov5640_probe().
This eliminates the need for manual fwnode_handle_put() calls.
Additionally, drop the redundant !endpoint check before
v4l2_fwnode_endpoint_parse(), as the parse function already handles
NULL endpoints safely.
Signed-off-by: Biren Pandya <birenpandya@xxxxxxxxx>
---
v3: adopted __free scoped guard (Laurent); explicitly dropped redundant endpoint check (Sakari).
---
drivers/media/i2c/ov5640.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 8deb5f5501faf..29d4dee9690b9 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -4,6 +4,7 @@
* Copyright (C) 2014-2017 Mentor Graphics Inc.
*/
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/clkdev.h>
@@ -3844,7 +3845,6 @@ static int ov5640_check_chip_id(struct ov5640_dev *sensor)
static int ov5640_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
- struct fwnode_handle *endpoint;
struct ov5640_dev *sensor;
int ret;
@@ -3869,15 +3869,10 @@ static int ov5640_probe(struct i2c_client *client)
sensor->ae_target = 52;
- endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev),
- NULL);
- if (!endpoint) {
- dev_err(dev, "endpoint node not found\n");
- return -EINVAL;
- }
+ struct fwnode_handle *endpoint __free(fwnode_handle) =
+ fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), NULL);
ret = v4l2_fwnode_endpoint_parse(endpoint, &sensor->ep);
- fwnode_handle_put(endpoint);
if (ret) {
dev_err(dev, "Could not parse endpoint\n");
return ret;
--
2.50.1 (Apple Git-155)