Skip to contentSkip to conversation

scsi: Use of_node_name_eq for node name comparisons

PATCH Applied Rob Herring 2 participants 2 messages Dec 5, 2018 – Dec 8, 2018 SCSI

lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 scsi: Use of_node_name_eq for node name comparisons

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 "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
---
 drivers/scsi/sun_esp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/sun_esp.c +3 -4
index a11efbcb7f8b..c71bd01fef94 100644
@@ -529,11 +529,10 @@ static int esp_sbus_probe(struct platform_device *op)
 	int hme = 0;
 	int ret;
 
-	if (dp->parent &&
-	    (!strcmp(dp->parent->name, "espdma") ||
-	     !strcmp(dp->parent->name, "dma")))
+	if (of_node_name_eq(dp->parent, "espdma") ||
+	    of_node_name_eq(dp->parent, "dma"))
 		dma_node = dp->parent;
-	else if (!strcmp(dp->name, "SUNW,fas")) {
+	else if (of_node_name_eq(dp, "SUNW,fas")) {
 		dma_node = op->dev.of_node;
 		hme = 1;
 	}
Signature · 1 line
2.19.1
Applied
#1 lore raw

Rob,

Quoted 2 lines

Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer.

Applied to 4.21/scsi-queue, thanks.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering