fbdev: Use of_node_name_eq for node name comparisons
Subsystems (4)
PATCH 1/1 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.
--- drivers/video/fbdev/aty/radeon_pm.c | 6 +++--- drivers/video/fbdev/cg14.c | 4 ++-- drivers/video/fbdev/cg3.c | 2 +- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/imsttfb.c | 4 ++-- drivers/video/fbdev/offb.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
drivers/video/fbdev/aty/radeon_pm.c +3 -3
@@ -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 * Snowy (M11 chip on iBook G4 manufactured after July 2005) */ -if (!strcmp (rinfo->of_node->name,"ATY,JasperParent" ) || - !strcmp (rinfo->of_node->name,"ATY,SnowyParent" )) { +if (of_node_name_eq (rinfo->of_node,"ATY,JasperParent" ) || +of_node_name_eq (rinfo->of_node,"ATY,SnowyParent" )) { rinfo->reinit_func = radeon_reinitialize_M10; rinfo->pm_mode |= radeon_pm_off; }
@@ -2855,7 +2855,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis rinfo->pm_mode |= radeon_pm_off; }#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->pm_mode |= radeon_pm_off; }
drivers/video/fbdev/cg14.c +2 -2
@@ -486,8 +486,8 @@ static int cg14_probe(struct platform_device *op) info->var.xres); info->fix.smem_len =PAGE_ALIGN (linebytes * info->var.yres); -if (!strcmp (dp->parent->name,"sbus" ) || - !strcmp (dp->parent->name,"sbi" )) { +if (of_node_name_eq (dp->parent,"sbus" ) || +of_node_name_eq (dp->parent,"sbi" )) { info->fix.smem_start = op->resource[0 ].start; par->iospace = op->resource[0 ].flags &IORESOURCE_BITS ; }else {
drivers/video/fbdev/cg3.c +1 -1
@@ -369,7 +369,7 @@ static int cg3_probe(struct platform_device *op) info->var.red.length =8 ; info->var.green.length =8 ; info->var.blue.length =8 ; -if (!strcmp (dp->name,"cgRDI" )) +if (of_node_name_eq (dp,"cgRDI" )) par->flags |=CG3_FLAG_RDI ;if (par->flags &CG3_FLAG_RDI )cg3_rdi_maybe_fixup_var (&info->var, dp);
drivers/video/fbdev/ffb.c +1 -1
@@ -944,7 +944,7 @@ static int ffb_probe(struct platform_device *op) 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->board_type =of_getintprop_default (dp,"board_type" ,0 );
drivers/video/fbdev/imsttfb.c +2 -2
@@ -1498,8 +1498,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)switch (pdev->device) {case PCI_DEVICE_ID_IMS_TT128 :/* IMS,tt128mbA */ par->ramdac =IBM ; -if (dp && ((strcmp (dp->name,"IMS,tt128mb8" ) ==0 ) || - (strcmp (dp->name,"IMS,tt128mb8A" ) ==0 ))) +if (of_node_name_eq (dp,"IMS,tt128mb8" ) || +of_node_name_eq (dp,"IMS,tt128mb8A" )) par->ramdac =TVP ;break ;case PCI_DEVICE_ID_IMS_TT3D :/* IMS,tt3d */
drivers/video/fbdev/offb.c +1 -1
@@ -646,7 +646,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) }#endif /* kludge for valkyrie */ -if (strcmp (dp->name,"valkyrie" ) ==0 ) +if (of_node_name_eq (dp,"valkyrie" )) address +=0x1000 ; offb_init_fb(no_real_node ? "bootx" : NULL, width, height, depth, pitch, address,
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c +2 -2
@@ -60,7 +60,7 @@ omapdss_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" ));of_node_put (ports); }
@@ -83,7 +83,7 @@ omapdss_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; }
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · Rob Herring
Convert string compares of DT node names to use
of_node_name_eqhelper 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.
Quoted 6 lines
Cc Benjamin Herrenschmidt <[email protected]>Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Rob Herring <[email protected]>
Patch queued for v5.1, thanks.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics