From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: stable@vger•kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
patches@lists•linux.dev,
Kyungmin Park <kyungmin.park@samsung•com>,
Kukjin Kim <kgene@kernel•org>,
Krzysztof Kozlowski <krzk@kernel•org>,
Hyun Kwon <hyun.kwon@xilinx•com>,
Michal Simek <michal.simek@xilinx•com>,
linux-arm-kernel@lists•infradead.org,
linux-samsung-soc@vger•kernel.org,
Laurent Pinchart <laurent.pinchart@ideasonboard•com>,
Benoit Parrot <bparrot@ti•com>, Rob Herring <robh@kernel•org>,
Sylwester Nawrocki <s.nawrocki@samsung•com>,
Hans Verkuil <hverkuil-cisco@xs4all•nl>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Sasha Levin <sashal@kernel•org>
Subject: [PATCH 4.19 129/273] media: Use of_node_name_eq for node name comparisons
Date: Wed, 20 Sep 2023 13:29:29 +0200 [thread overview]
Message-ID: <20230920112850.498608128@linuxfoundation.org> (raw)
In-Reply-To: <20230920112846.440597133@linuxfoundation.org>
4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <robh@kernel•org>
[ Upstream commit 2fc6e404117e5b921097c929ba572a00e4421b50 ]
Convert string compares of DT node names to use of_node_name_eq helper
instead. This removes direct access to the node name pointer.
Cc: Kyungmin Park <kyungmin.park@samsung•com>
Cc: Kukjin Kim <kgene@kernel•org>
Cc: Krzysztof Kozlowski <krzk@kernel•org>
Cc: Hyun Kwon <hyun.kwon@xilinx•com>
Cc: Michal Simek <michal.simek@xilinx•com>
Cc: linux-arm-kernel@lists•infradead.org
Cc: linux-samsung-soc@vger•kernel.org
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard•com>
Reviewed-by: Benoit Parrot <bparrot@ti•com>
Signed-off-by: Rob Herring <robh@kernel•org>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all•nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Stable-dep-of: d7b13edd4cb4 ("media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()")
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
drivers/media/platform/exynos4-is/media-dev.c | 12 ++++++------
drivers/media/platform/ti-vpe/cal.c | 4 ++--
drivers/media/platform/xilinx/xilinx-tpg.c | 2 +-
drivers/media/v4l2-core/v4l2-fwnode.c | 6 ++----
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index 03171f2cf2968..5f50ea283a04f 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -445,7 +445,7 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
*/
np = of_get_parent(rem);
- if (np && !of_node_cmp(np->name, "i2c-isp"))
+ if (of_node_name_eq(np, "i2c-isp"))
pd->fimc_bus_type = FIMC_BUS_TYPE_ISP_WRITEBACK;
else
pd->fimc_bus_type = pd->sensor_bus_type;
@@ -492,7 +492,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd)
for_each_available_child_of_node(parent, node) {
struct device_node *port;
- if (of_node_cmp(node->name, "csis"))
+ if (!of_node_name_eq(node, "csis"))
continue;
/* The csis node can have only port subnode. */
port = of_get_next_child(node, NULL);
@@ -713,13 +713,13 @@ static int fimc_md_register_platform_entities(struct fimc_md *fmd,
continue;
/* If driver of any entity isn't ready try all again later. */
- if (!strcmp(node->name, CSIS_OF_NODE_NAME))
+ if (of_node_name_eq(node, CSIS_OF_NODE_NAME))
plat_entity = IDX_CSIS;
- else if (!strcmp(node->name, FIMC_IS_OF_NODE_NAME))
+ else if (of_node_name_eq(node, FIMC_IS_OF_NODE_NAME))
plat_entity = IDX_IS_ISP;
- else if (!strcmp(node->name, FIMC_LITE_OF_NODE_NAME))
+ else if (of_node_name_eq(node, FIMC_LITE_OF_NODE_NAME))
plat_entity = IDX_FLITE;
- else if (!strcmp(node->name, FIMC_OF_NODE_NAME) &&
+ else if (of_node_name_eq(node, FIMC_OF_NODE_NAME) &&
!of_property_read_bool(node, "samsung,lcd-wb"))
plat_entity = IDX_FIMC;
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index d945323fc437d..f9488e01a36f0 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1618,7 +1618,7 @@ of_get_next_port(const struct device_node *parent,
return NULL;
}
prev = port;
- } while (of_node_cmp(port->name, "port") != 0);
+ } while (!of_node_name_eq(port, "port"));
}
return port;
@@ -1638,7 +1638,7 @@ of_get_next_endpoint(const struct device_node *parent,
if (!ep)
return NULL;
prev = ep;
- } while (of_node_cmp(ep->name, "endpoint") != 0);
+ } while (!of_node_name_eq(ep, "endpoint"));
return ep;
}
diff --git a/drivers/media/platform/xilinx/xilinx-tpg.c b/drivers/media/platform/xilinx/xilinx-tpg.c
index 9c49d1d10bee5..06d25e5fafbf2 100644
--- a/drivers/media/platform/xilinx/xilinx-tpg.c
+++ b/drivers/media/platform/xilinx/xilinx-tpg.c
@@ -725,7 +725,7 @@ static int xtpg_parse_of(struct xtpg_device *xtpg)
const struct xvip_video_format *format;
struct device_node *endpoint;
- if (!port->name || of_node_cmp(port->name, "port"))
+ if (!of_node_name_eq(port, "port"))
continue;
format = xvip_of_get_format(port);
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 169bdbb1f61a5..8046871e89f87 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -290,8 +290,7 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
fwnode = fwnode_get_parent(__fwnode);
fwnode_property_read_u32(fwnode, port_prop, &link->local_port);
fwnode = fwnode_get_next_parent(fwnode);
- if (is_of_node(fwnode) &&
- of_node_cmp(to_of_node(fwnode)->name, "ports") == 0)
+ if (is_of_node(fwnode) && of_node_name_eq(to_of_node(fwnode), "ports"))
fwnode = fwnode_get_next_parent(fwnode);
link->local_node = fwnode;
@@ -304,8 +303,7 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
fwnode = fwnode_get_parent(fwnode);
fwnode_property_read_u32(fwnode, port_prop, &link->remote_port);
fwnode = fwnode_get_next_parent(fwnode);
- if (is_of_node(fwnode) &&
- of_node_cmp(to_of_node(fwnode)->name, "ports") == 0)
+ if (is_of_node(fwnode) && of_node_name_eq(to_of_node(fwnode), "ports"))
fwnode = fwnode_get_next_parent(fwnode);
link->remote_node = fwnode;
--
2.40.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
parent reply other threads:[~2023-09-20 12:16 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20230920112846.440597133@linuxfoundation.org>]
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=20230920112850.498608128@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=bparrot@ti$(echo .)com \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=hyun.kwon@xilinx$(echo .)com \
--cc=kgene@kernel$(echo .)org \
--cc=krzk@kernel$(echo .)org \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=laurent.pinchart@ideasonboard$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-samsung-soc@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=michal.simek@xilinx$(echo .)com \
--cc=patches@lists$(echo .)linux.dev \
--cc=robh@kernel$(echo .)org \
--cc=s.nawrocki@samsung$(echo .)com \
--cc=sashal@kernel$(echo .)org \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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