Commit a6f13af4 authored by Rob Herring's avatar Rob Herring Committed by Bartlomiej Zolnierkiewicz

fbdev: 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.

For instances using of_node_cmp, this has the side effect of now using
case sensitive comparisons. This should not matter for any FDT based
system which omap is.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 23cd78e2
...@@ -2844,8 +2844,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis ...@@ -2844,8 +2844,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis
* in some desktop G4s), Via (M9+ chip on iBook G4) and * in some desktop G4s), Via (M9+ chip on iBook G4) and
* Snowy (M11 chip on iBook G4 manufactured after July 2005) * Snowy (M11 chip on iBook G4 manufactured after July 2005)
*/ */
if (!strcmp(rinfo->of_node->name, "ATY,JasperParent") || if (of_node_name_eq(rinfo->of_node, "ATY,JasperParent") ||
!strcmp(rinfo->of_node->name, "ATY,SnowyParent")) { of_node_name_eq(rinfo->of_node, "ATY,SnowyParent")) {
rinfo->reinit_func = radeon_reinitialize_M10; rinfo->reinit_func = radeon_reinitialize_M10;
rinfo->pm_mode |= radeon_pm_off; rinfo->pm_mode |= radeon_pm_off;
} }
...@@ -2855,7 +2855,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis ...@@ -2855,7 +2855,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis
rinfo->pm_mode |= radeon_pm_off; rinfo->pm_mode |= radeon_pm_off;
} }
#endif #endif
if (!strcmp(rinfo->of_node->name, "ATY,ViaParent")) { if (of_node_name_eq(rinfo->of_node, "ATY,ViaParent")) {
rinfo->reinit_func = radeon_reinitialize_M9P; rinfo->reinit_func = radeon_reinitialize_M9P;
rinfo->pm_mode |= radeon_pm_off; rinfo->pm_mode |= radeon_pm_off;
} }
......
...@@ -486,8 +486,8 @@ static int cg14_probe(struct platform_device *op) ...@@ -486,8 +486,8 @@ static int cg14_probe(struct platform_device *op)
info->var.xres); info->var.xres);
info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres); info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
if (!strcmp(dp->parent->name, "sbus") || if (of_node_name_eq(dp->parent, "sbus") ||
!strcmp(dp->parent->name, "sbi")) { of_node_name_eq(dp->parent, "sbi")) {
info->fix.smem_start = op->resource[0].start; info->fix.smem_start = op->resource[0].start;
par->iospace = op->resource[0].flags & IORESOURCE_BITS; par->iospace = op->resource[0].flags & IORESOURCE_BITS;
} else { } else {
......
...@@ -369,7 +369,7 @@ static int cg3_probe(struct platform_device *op) ...@@ -369,7 +369,7 @@ static int cg3_probe(struct platform_device *op)
info->var.red.length = 8; info->var.red.length = 8;
info->var.green.length = 8; info->var.green.length = 8;
info->var.blue.length = 8; info->var.blue.length = 8;
if (!strcmp(dp->name, "cgRDI")) if (of_node_name_eq(dp, "cgRDI"))
par->flags |= CG3_FLAG_RDI; par->flags |= CG3_FLAG_RDI;
if (par->flags & CG3_FLAG_RDI) if (par->flags & CG3_FLAG_RDI)
cg3_rdi_maybe_fixup_var(&info->var, dp); cg3_rdi_maybe_fixup_var(&info->var, dp);
......
...@@ -944,7 +944,7 @@ static int ffb_probe(struct platform_device *op) ...@@ -944,7 +944,7 @@ static int ffb_probe(struct platform_device *op)
info->var.accel_flags = FB_ACCELF_TEXT; info->var.accel_flags = FB_ACCELF_TEXT;
if (!strcmp(dp->name, "SUNW,afb")) if (of_node_name_eq(dp, "SUNW,afb"))
par->flags |= FFB_FLAG_AFB; par->flags |= FFB_FLAG_AFB;
par->board_type = of_getintprop_default(dp, "board_type", 0); par->board_type = of_getintprop_default(dp, "board_type", 0);
......
...@@ -1498,8 +1498,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1498,8 +1498,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
switch (pdev->device) { switch (pdev->device) {
case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */ case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */
par->ramdac = IBM; par->ramdac = IBM;
if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) || if (of_node_name_eq(dp, "IMS,tt128mb8") ||
(strcmp(dp->name, "IMS,tt128mb8A") == 0))) of_node_name_eq(dp, "IMS,tt128mb8A"))
par->ramdac = TVP; par->ramdac = TVP;
break; break;
case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */ case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */
......
...@@ -646,7 +646,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) ...@@ -646,7 +646,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
} }
#endif #endif
/* kludge for valkyrie */ /* kludge for valkyrie */
if (strcmp(dp->name, "valkyrie") == 0) if (of_node_name_eq(dp, "valkyrie"))
address += 0x1000; address += 0x1000;
offb_init_fb(no_real_node ? "bootx" : NULL, offb_init_fb(no_real_node ? "bootx" : NULL,
width, height, depth, pitch, address, width, height, depth, pitch, address,
......
...@@ -60,7 +60,7 @@ omapdss_of_get_next_port(const struct device_node *parent, ...@@ -60,7 +60,7 @@ omapdss_of_get_next_port(const struct device_node *parent,
return NULL; return NULL;
} }
prev = port; prev = port;
} while (of_node_cmp(port->name, "port") != 0); } while (!of_node_name_eq(port, "port"));
of_node_put(ports); of_node_put(ports);
} }
...@@ -83,7 +83,7 @@ omapdss_of_get_next_endpoint(const struct device_node *parent, ...@@ -83,7 +83,7 @@ omapdss_of_get_next_endpoint(const struct device_node *parent,
if (!ep) if (!ep)
return NULL; return NULL;
prev = ep; prev = ep;
} while (of_node_cmp(ep->name, "endpoint") != 0); } while (!of_node_name_eq(ep, "endpoint"));
return ep; return ep;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment