From patchwork Thu Dec 6 19:35:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 153062 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10934985ljp; Thu, 6 Dec 2018 11:35:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/XSbc5N97yvFUeuH7cwuC17Ag4iNKwn/qC0jx/yAFDVQldhNMcrPt9AnQAwyORoSqYrspbn X-Received: by 2002:a65:4683:: with SMTP id h3mr24132812pgr.225.1544124924586; Thu, 06 Dec 2018 11:35:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544124924; cv=none; d=google.com; s=arc-20160816; b=0LE1q+55HJn4UV9Oy3nOwwSXcoqJ3Ohsw+TOmgq5XQ7UrMReFCdqZZP7ZOJolxjepk OsPdzAh3Q7S1QfWMHuJHlhVVMXUW0egqROBebOpXSKeuQF9nk12YSC3itQw7MtI2f6pc ntfLo0C+sZ4V6qwfRKT41iWB9eoCwDMY04L6GoHS5YqrCFiATA8pGAy42vZz/pjlyp+L LsUZaKGEjG+hnR+1yb41VkJBSIAJfXJL0OlH23c05Aqc+u++R9zgURg3K4A9kJRIYyMs e2tGilvt6Ri91h836rjK+Jjqo/WIEcMj8RFqG4EQFIA5SLN9+nVwF1wxZ25dJzoXb8hl 72lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=oXsFqVkQvC9jOdOHTS5EB/PSIvwqVFJymMgC+jRnc5E=; b=b7oqYIzEUHueRzpJyV+gV2UHz8/IL805EmkmrvLu/9+T50c/mAmeaZc2rlUExBYjac YlSaZloBXQ2mnLyS4eg5DwhlZJRRdB8xbN22uZCh30LFi1fcfjCP/ekTYXkVTxshyL/w eMK60Uz7H8YsvKhCv93BFVolveQ5mTKOCcv/TWeWMa84avXpty6g2LAASnqStfu3mmjL xDk3pk+0WMvHf32Au+6CeDw5yG9ZrIdA0CTau9c9SJgzYcMV/aapgzJUG8lTh+jWryp+ tjnxpvYO7cATkENNHtNIIjN6Wq67xM3NWVQl9gRki2wRAeLyCqqcXDT4Ky93f0Hr7z12 rOug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si847005pgm.462.2018.12.06.11.35.24; Thu, 06 Dec 2018 11:35:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725927AbeLFTfY (ORCPT + 3 others); Thu, 6 Dec 2018 14:35:24 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:45895 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725921AbeLFTfX (ORCPT ); Thu, 6 Dec 2018 14:35:23 -0500 Received: by mail-ot1-f65.google.com with SMTP id 32so1501912ota.12; Thu, 06 Dec 2018 11:35:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oXsFqVkQvC9jOdOHTS5EB/PSIvwqVFJymMgC+jRnc5E=; b=Oc7lbnLnQjgenLapXplLbMaCvEr/kqxGBWFmTbNWVgqiGbd8lP4aWTH0u+xknbos7/ Yj/dKS9w1RdVMC8A/IaPQbceOLPrVO7BBwEXAPeiQVvxe8GLZn4YxSlomH++vgGVO6ry T7FoU4lIoDHeA5JTus5YN2Sa6dEBY1cghiqLuM65Epp3Ze2JjAaORM0wvDKveVEIxKmU yl6eiYjaFRJOP0BI+UBD7LEt6QpBCjaDX5WwsTa92WzqLKpovYBmChk3PfkaYBfjaq8y tCIvDBhdbgMqidZPoCU6p36F3MF6s3icnqMqvvf0TI/z3RH7JXXHrwCH7sCA7XlJ00Rr +1qQ== X-Gm-Message-State: AA+aEWaicTmTWLQSASu8kvvfrL4UUdQKQKpzSXjumcSUQe8E8x/qhYWD smKrlzJBp0aTgT40QzMON5g09b8= X-Received: by 2002:a9d:a78:: with SMTP id 111mr18561582otg.229.1544124921409; Thu, 06 Dec 2018 11:35:21 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id i5sm479863oia.46.2018.12.06.11.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 11:35:20 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kyungmin Park , Sylwester Nawrocki , Mauro Carvalho Chehab , Kukjin Kim , Krzysztof Kozlowski , Hyun Kwon , Michal Simek , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Laurent Pinchart , Benoit Parrot Subject: [PATCH v2] media: Use of_node_name_eq for node name comparisons Date: Thu, 6 Dec 2018 13:35:19 -0600 Message-Id: <20181206193519.13367-1-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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 Cc: Sylwester Nawrocki Cc: Mauro Carvalho Chehab Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: Hyun Kwon Cc: Michal Simek Cc: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Reviewed-by: Laurent Pinchart Reviewed-by: Benoit Parrot Signed-off-by: Rob Herring --- v2: - Also convert tabs to spaces between the 'if' and '(' 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(-) -- 2.19.1 diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 870501b0f351..463f2d84553e 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; @@ -495,7 +495,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); @@ -720,13 +720,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 95a093f41905..fc3c212b96e1 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -1615,7 +1615,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; @@ -1635,7 +1635,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 851d20dcd550..ce686b8d6cff 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 218f0da0ce76..849326241b17 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -564,8 +564,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; @@ -578,8 +577,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;