ARM: Convert to using %pOF instead of full_name
Subsystems (21)
PATCH v2 1/1 ARM: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.
Signed-off-by Rob Herring <[email protected]>
Acked-by Heiko Stuebner <[email protected]>
Reviewed-by Geert Uytterhoeven <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>
Cc Russell King <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc "Beno?t Cousson" <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-samsung-soc at vger.kernel.org
Cc linux-omap at vger.kernel.org
Cc linux-rockchip at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org
---
v2:
- Merge several 2 line prints to single line.
- Add acks
arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm/kernel/devtree.c | 5 ++--- arch/arm/kernel/topology.c | 3 +-- arch/arm/mach-exynos/suspend.c | 7 +++---- arch/arm/mach-imx/gpc.c | 4 ++-- arch/arm/mach-mvebu/kirkwood.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++-- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- arch/arm/mach-rockchip/platsmp.c | 4 ++-- arch/arm/mach-shmobile/pm-rmobile.c | 7 +++---- 10 files changed, 20 insertions(+), 25 deletions(-)
arch/arm/kernel/cpuidle.c +2 -2
@@ -101,8 +101,8 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) ops =arm_cpuidle_get_ops (enable_method);if (!ops) { -pr_warn ("%s: unsupported enable-method property: %s\n" , - dn->full_name, enable_method); +pr_warn ("%pOF: unsupported enable-method property: %s\n" , + dn, enable_method);return -EOPNOTSUPP ; }
arch/arm/kernel/devtree.c +2 -3
@@ -95,7 +95,7 @@ void __init arm_dt_init_cpu_maps(void)if (of_node_cmp (cpu->type,"cpu" ))continue ; -pr_debug (" * %s...\n" , cpu->full_name); +pr_debug (" * %pOF...\n" , cpu);/* * A device tree containing CPU nodes with missing "reg" * properties is considered invalid to build the
@@ -103,8 +103,7 @@ void __init arm_dt_init_cpu_maps(void)*/ cell =of_get_property (cpu,"reg" , &prop_bytes);if (!cell || prop_bytes <sizeof (*cell)) { -pr_debug (" * %s missing reg property\n" , - cpu->full_name); +pr_debug (" * %pOF missing reg property\n" , cpu);of_node_put (cpu);return ; }
arch/arm/kernel/topology.c +1 -2
@@ -127,8 +127,7 @@ static void __init parse_dt_topology(void) rate =of_get_property (cn,"clock-frequency" , &len);if (!rate || len !=4 ) { -pr_err ("%s missing clock-frequency property\n" , - cn->full_name); +pr_err ("%pOF missing clock-frequency property\n" , cn);continue ; }
arch/arm/mach-exynos/suspend.c +3 -4
@@ -187,21 +187,20 @@ static int __init exynos_pmu_irq_init(struct device_node *node,struct irq_domain *parent_domain, *domain;if (!parent) { -pr_err ("%s: no parent, giving up\n" , node->full_name); +pr_err ("%pOF: no parent, giving up\n" , node);return -ENODEV ; } parent_domain =irq_find_host (parent);if (!parent_domain) { -pr_err ("%s: unable to obtain parent domain\n" , node->full_name); +pr_err ("%pOF: unable to obtain parent domain\n" , node);return -ENXIO ; } pmu_base_addr =of_iomap (node,0 );if (!pmu_base_addr) { -pr_err ("%s: failed to find exynos pmu register\n" , - node->full_name); +pr_err ("%pOF: failed to find exynos pmu register\n" , node);return -ENOMEM ; }
arch/arm/mach-imx/gpc.c +2 -2
@@ -224,13 +224,13 @@ static int __init imx_gpc_init(struct device_node *node,int i;if (!parent) { -pr_err ("%s: no parent, giving up\n" , node->full_name); +pr_err ("%pOF: no parent, giving up\n" , node);return -ENODEV ; } parent_domain =irq_find_host (parent);if (!parent_domain) { -pr_err ("%s: unable to obtain parent domain\n" , node->full_name); +pr_err ("%pOF: unable to obtain parent domain\n" , node);return -ENXIO ; }
arch/arm/mach-mvebu/kirkwood.c +1 -2
@@ -107,8 +107,7 @@ static void __init kirkwood_dt_eth_fixup(void)clk_prepare_enable (clk);/* store MAC address register contents in local-mac-address */ -pr_err (FW_INFO "%s: local-mac-address is not set\n" , - np->full_name); +pr_err (FW_INFO "%pOF: local-mac-address is not set\n" , np); pmac =kzalloc (sizeof (*pmac) +6 ,GFP_KERNEL );if (!pmac)
arch/arm/mach-omap2/omap-wakeupgen.c +2 -2
@@ -522,13 +522,13 @@ static int __init wakeupgen_init(struct device_node *node,u32 val;if (!parent) { -pr_err ("%s: no parent, giving up\n" , node->full_name); +pr_err ("%pOF: no parent, giving up\n" , node);return -ENODEV ; } parent_domain =irq_find_host (parent);if (!parent_domain) { -pr_err ("%s: unable to obtain parent domain\n" , node->full_name); +pr_err ("%pOF: unable to obtain parent domain\n" , node);return -ENXIO ; }/* Not supported on OMAP4 ES1.0 silicon */
arch/arm/mach-omap2/omap_hwmod.c +2 -2
@@ -2417,8 +2417,8 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,if (mem)pr_err ("omap_hwmod: %s: Could not ioremap\n" , oh->name);else -pr_err ("omap_hwmod: %s: Missing dt reg%i for %s\n" , - oh->name, index, np->full_name); +pr_err ("omap_hwmod: %s: Missing dt reg%i for %pOF\n" , + oh->name, index, np);return -ENXIO ; }
arch/arm/mach-rockchip/platsmp.c +2 -2
@@ -182,8 +182,8 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node) ret =of_address_to_resource (node,0 , &res);if (ret <0 ) { -pr_err ("%s: could not get address for node %s\n" , - __func__, node->full_name); +pr_err ("%s: could not get address for node %pOF\n" , + __func__, node);return ret; }
arch/arm/mach-shmobile/pm-rmobile.c +3 -4
@@ -195,8 +195,7 @@ static void __init add_special_pd(struct device_node *np, enum pd_types type)return ; } -pr_debug ("Special PM domain %s type %d for %s\n" , pd->name, type, - np->full_name); +pr_debug ("Special PM domain %s type %d for %pOF\n" , pd->name, type, np); special_pds[num_special_pds].pd = pd; special_pds[num_special_pds].type = type;
@@ -331,13 +330,13 @@ static int __init rmobile_init_pm_domains(void)for_each_compatible_node (np,NULL ,"renesas,sysc-rmobile" ) { base =of_iomap (np,0 );if (!base) { -pr_warn ("%s cannot map reg 0\n" , np->full_name); +pr_warn ("%pOF cannot map reg 0\n" , np);continue ; } pmd =of_get_child_by_name (np,"pm-domains" );if (!pmd) { -pr_warn ("%s lacks pm-domains node\n" , np->full_name); +pr_warn ("%pOF lacks pm-domains node\n" , np);continue ; }
Signature · 1 line
2.11.0
PATCH v2 1/1 media: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.
Signed-off-by Rob Herring <[email protected]>
Acked-by Niklas S?derlund <[email protected]>
Acked-by Laurent Pinchart <[email protected]>
Reviewed-by Matthias Brugger <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Acked-by Lad, Prabhakar <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Andrzej Hajda <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Songjun Wu <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Minghsiu Tsai <[email protected]>
Cc Houlong Wei <[email protected]>
Cc Andrew-CT Chen <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
Cc Hyun Kwon <[email protected]>
Cc Michal Simek <[email protected]>
Cc "S?ren Brinkmann" <[email protected]>
Cc linux-media at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-samsung-soc at vger.kernel.org
Cc linux-mediatek at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org
---
v2:
- Fix missing to_of_node() in xilinx-vipp.c
- Drop v4l2-async.c changes. Doing as revert instead.
- Add acks
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 3 +- drivers/media/i2c/s5k5baf.c | 7 ++-- drivers/media/platform/am437x/am437x-vpfe.c | 4 +- drivers/media/platform/atmel/atmel-isc.c | 4 +- drivers/media/platform/davinci/vpif_capture.c | 16 ++++---- drivers/media/platform/exynos4-is/fimc-is.c | 8 ++-- drivers/media/platform/exynos4-is/fimc-lite.c | 3 +- drivers/media/platform/exynos4-is/media-dev.c | 8 ++-- drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 6 +-- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 8 ++-- drivers/media/platform/omap3isp/isp.c | 8 ++-- drivers/media/platform/pxa_camera.c | 2 +- drivers/media/platform/rcar-vin/rcar-core.c | 4 +- drivers/media/platform/soc_camera/soc_camera.c | 6 +-- drivers/media/platform/xilinx/xilinx-vipp.c | 52 +++++++++++++------------- drivers/media/v4l2-core/v4l2-clk.c | 3 +- include/media/v4l2-clk.h | 4 +- 18 files changed, 70 insertions(+), 80 deletions(-)
drivers/media/i2c/s5c73m3/s5c73m3-core.c +1 -2
@@ -1635,8 +1635,7 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) node_ep =of_graph_get_next_endpoint (node,NULL );if (!node_ep) { -dev_warn (dev,"no endpoint defined for node: %s\n" , - node->full_name); +dev_warn (dev,"no endpoint defined for node: %pOF\n" , node);return 0 ; }
drivers/media/i2c/s5k5baf.c +3 -4
@@ -1863,8 +1863,7 @@ static int s5k5baf_parse_device_node(struct s5k5baf *state, struct device *dev) node_ep =of_graph_get_next_endpoint (node,NULL );if (!node_ep) { -dev_err (dev,"no endpoint defined at node %s\n" , - node->full_name); +dev_err (dev,"no endpoint defined at node %pOF\n" , node);return -EINVAL ; }
@@ -1882,8 +1881,8 @@ static int s5k5baf_parse_device_node(struct s5k5baf *state, struct device *dev)case V4L2_MBUS_PARALLEL :break ;default : -dev_err (dev,"unsupported bus in endpoint defined at node %s\n" , - node->full_name); +dev_err (dev,"unsupported bus in endpoint defined at node %pOF\n" , + node);return -EINVAL ; }
drivers/media/platform/am437x/am437x-vpfe.c +2 -2
@@ -2490,8 +2490,8 @@ vpfe_get_pdata(struct platform_device *pdev) rem =of_graph_get_remote_port_parent (endpoint);if (!rem) { -dev_err (&pdev->dev,"Remote device at %s not found\n" , - endpoint->full_name); +dev_err (&pdev->dev,"Remote device at %pOF not found\n" , + endpoint); goto done; }
drivers/media/platform/atmel/atmel-isc.c +2 -2
@@ -1700,8 +1700,8 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc) rem =of_graph_get_remote_port_parent (epn);if (!rem) { -dev_notice (dev,"Remote device at %s not found\n" , -of_node_full_name (epn)); +dev_notice (dev,"Remote device at %pOF not found\n" , + epn);continue ; }
drivers/media/platform/davinci/vpif_capture.c +8 -8
@@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier, vpif_obj.config->chan_config->inputs[i].subdev_name = (char *)to_of_node (subdev->fwnode)->full_name;vpif_dbg (2 , debug, -"%s: setting input %d subdev_name = %s\n" , +"%s: setting input %d subdev_name = %pOF\n" , __func__, i, -to_of_node (subdev->fwnode)->full_name); +to_of_node (subdev->fwnode));return 0 ; } }
@@ -1557,8 +1557,8 @@ vpif_capture_get_pdata(struct platform_device *pdev)dev_err (&pdev->dev,"Could not parse the endpoint\n" ); goto done; } -dev_dbg (&pdev->dev,"Endpoint %s, bus_width = %d\n" , - endpoint->full_name, bus_cfg.bus.parallel.bus_width); +dev_dbg (&pdev->dev,"Endpoint %pOF, bus_width = %d\n" , + endpoint, bus_cfg.bus.parallel.bus_width); flags = bus_cfg.bus.parallel.flags;if (flags &V4L2_MBUS_HSYNC_ACTIVE_HIGH )
@@ -1569,13 +1569,13 @@ vpif_capture_get_pdata(struct platform_device *pdev) rem =of_graph_get_remote_port_parent (endpoint);if (!rem) { -dev_dbg (&pdev->dev,"Remote device at %s not found\n" , - endpoint->full_name); +dev_dbg (&pdev->dev,"Remote device at %pOF not found\n" , + endpoint); goto done; } -dev_dbg (&pdev->dev,"Remote device %s, %s found\n" , - rem->name, rem->full_name); +dev_dbg (&pdev->dev,"Remote device %s, %pOF found\n" , + rem->name, rem); sdinfo->name = rem->full_name; pdata->asd[i] = devm_kzalloc(&pdev->dev,
drivers/media/platform/exynos4-is/fimc-is.c +4 -4
@@ -174,8 +174,8 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index, sensor->drvdata =fimc_is_sensor_get_drvdata (node);if (!sensor->drvdata) { -dev_err (&is->pdev->dev,"no driver data found for: %s\n" , - node->full_name); +dev_err (&is->pdev->dev,"no driver data found for: %pOF\n" , + node);return -EINVAL ; }
@@ -191,8 +191,8 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index,/* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */ ret =of_property_read_u32 (port,"reg" , &tmp);if (ret <0 ) { -dev_err (&is->pdev->dev,"reg property not found at: %s\n" , - port->full_name); +dev_err (&is->pdev->dev,"reg property not found at: %pOF\n" , + port);of_node_put (port);return ret; }
drivers/media/platform/exynos4-is/fimc-lite.c +1 -2
@@ -1493,8 +1493,7 @@ static int fimc_lite_probe(struct platform_device *pdev)if (!drv_data || fimc->index >= drv_data->num_instances || fimc->index <0 ) { -dev_err (dev,"Wrong %s node alias\n" , - dev->of_node->full_name); +dev_err (dev,"Wrong %pOF node alias\n" , dev->of_node);return -EINVAL ; }
drivers/media/platform/exynos4-is/media-dev.c +4 -4
@@ -412,8 +412,8 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd, rem =of_graph_get_remote_port_parent (ep);of_node_put (ep);if (rem ==NULL ) { -v4l2_info (&fmd->v4l2_dev,"Remote device at %s not found\n" , - ep->full_name); +v4l2_info (&fmd->v4l2_dev,"Remote device at %pOF not found\n" , + ep);return 0 ; }
@@ -430,8 +430,8 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,*/ pd->sensor_bus_type =FIMC_BUS_TYPE_MIPI_CSI2 ; }else { -v4l2_err (&fmd->v4l2_dev,"Wrong port id (%u) at node %s\n" , - endpoint.base.port, rem->full_name); +v4l2_err (&fmd->v4l2_dev,"Wrong port id (%u) at node %pOF\n" , + endpoint.base.port, rem); }/* * For FIMC-IS handled sensors, that are placed under i2c-isp device
drivers/media/platform/exynos4-is/mipi-csis.c +2 -2
@@ -730,8 +730,8 @@ static int s5pcsis_parse_dt(struct platform_device *pdev, node =of_graph_get_next_endpoint (node,NULL );if (!node) { -dev_err (&pdev->dev,"No port node at %s\n" , - pdev->dev.of_node->full_name); +dev_err (&pdev->dev,"No port node at %pOF\n" , + pdev->dev.of_node);return -EINVAL ; }/* Get port node and validate MIPI-CSI channel id. */
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +2 -4
@@ -134,15 +134,13 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, larb_node =of_parse_phandle (node,"mediatek,larb" ,0 );if (!larb_node) {dev_err (dev, -"Missing mediadek,larb phandle in %s node\n" , - node->full_name); +"Missing mediadek,larb phandle in %pOF node\n" , node);return -EINVAL ; } larb_pdev =of_find_device_by_node (larb_node);if (!larb_pdev) { -dev_warn (dev,"Waiting for larb device %s\n" , - larb_node->full_name); +dev_warn (dev,"Waiting for larb device %pOF\n" , larb_node);of_node_put (larb_node);return -EPROBE_DEFER ; }
drivers/media/platform/mtk-mdp/mtk_mdp_core.c +4 -4
@@ -137,16 +137,16 @@ static int mtk_mdp_probe(struct platform_device *pdev)continue ;if (!of_device_is_available (node)) { -dev_err (dev,"Skipping disabled component %s\n" , - node->full_name); +dev_err (dev,"Skipping disabled component %pOF\n" , + node);continue ; } comp_type = (enum mtk_mdp_comp_type )of_id->data; comp_id =mtk_mdp_comp_get_id (dev, node, comp_type);if (comp_id <0 ) { -dev_warn (dev,"Skipping unknown component %s\n" , - node->full_name); +dev_warn (dev,"Skipping unknown component %pOF\n" , + node);continue ; }
drivers/media/platform/omap3isp/isp.c +4 -4
@@ -2020,8 +2020,8 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,if (ret)return ret; -dev_dbg (dev,"parsing endpoint %s, interface %u\n" , -to_of_node (fwnode)->full_name, vep.base.port); +dev_dbg (dev,"parsing endpoint %pOF, interface %u\n" , +to_of_node (fwnode), vep.base.port);switch (vep.base.port) {case ISP_OF_PHY_PARALLEL :
@@ -2078,8 +2078,8 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,break ;default : -dev_warn (dev,"%s: invalid interface %u\n" , -to_of_node (fwnode)->full_name, vep.base.port); +dev_warn (dev,"%pOF: invalid interface %u\n" , +to_of_node (fwnode), vep.base.port);break ; }
drivers/media/platform/pxa_camera.c +1 -1
@@ -2328,7 +2328,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev, asd->match.fwnode.fwnode =of_fwnode_handle (remote);of_node_put (remote); }else { -dev_notice (dev,"no remote for %s\n" ,of_node_full_name (np)); +dev_notice (dev,"no remote for %pOF\n" , np); } out:
drivers/media/platform/rcar-vin/rcar-core.c +2 -2
@@ -222,8 +222,8 @@ static int rvin_digital_graph_init(struct rvin_dev *vin) subdevs[0 ] = &vin->digital.asd; -vin_dbg (vin,"Found digital subdevice %s\n" , -of_node_full_name (to_of_node (subdevs[0 ]->match.fwnode.fwnode))); +vin_dbg (vin,"Found digital subdevice %pOF\n" , +to_of_node (subdevs[0 ]->match.fwnode.fwnode)); vin->notifier.num_subdevs =1 ; vin->notifier.subdevs = subdevs;
drivers/media/platform/soc_camera/soc_camera.c +2 -4
@@ -1550,8 +1550,7 @@ static int soc_of_bind(struct soc_camera_host *ici,v4l2_clk_name_i2c (clk_name,sizeof (clk_name), client->adapter->nr, client->addr); else - v4l2_clk_name_of(clk_name, sizeof(clk_name), -of_node_full_name (remote )); + v4l2_clk_name_of(clk_name, sizeof(clk_name), remote); icd->clk =v4l2_clk_register (&soc_camera_clk_ops, clk_name, icd);if (IS_ERR (icd->clk)) {
@@ -1590,8 +1589,7 @@ static void scan_of_host(struct soc_camera_host *ici) ren =of_graph_get_remote_port (epn);if (!ren) { -dev_notice (dev,"no remote for %s\n" , -of_node_full_name (epn)); +dev_notice (dev,"no remote for %pOF\n" , epn);continue ; }
drivers/media/platform/xilinx/xilinx-vipp.c +25 -27
138 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-clk.c +1 -2
@@ -61,8 +61,7 @@ struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id)/* if dev_name is not found, try use the OF name to find again */ if (PTR_ERR (clk) == -ENODEV && dev->of_node) { -v4l2_clk_name_of (clk_name,sizeof (clk_name), -of_node_full_name (dev->of_node)); +v4l2_clk_name_of (clk_name,sizeof (clk_name), dev->of_node); clk =v4l2_clk_find (clk_name); }
include/media/v4l2-clk.h +2 -2
@@ -70,7 +70,7 @@ static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id,#define v4l2_clk_name_i2c (name, size, adap, client) snprintf(name, size, \ "%d-%04x", adap, client) -#define v4l2_clk_name_of (name, size, of_full_name) snprintf(name, size, \ - "of-%s", of_full_name) +#define v4l2_clk_name_of (name, size, node) snprintf(name, size, \ + "of-%pOF", node)#endif
Signature · 1 line
2.11.0
Re: [PATCH v2] media: Convert to using %pOF instead of full_name
Quoted 11 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring<[email protected]>Acked-by Niklas S?derlund<[email protected]>Acked-by Laurent Pinchart<[email protected]>Reviewed-by Matthias Brugger<[email protected]>Acked-by Nicolas Ferre<[email protected]>Acked-by Lad, Prabhakar<[email protected]>
Quoted 5 lines
---
v2:
- Fix missingto_of_node()inxilinx-vipp.c
- Dropv4l2-async.cchanges. Doing as revert instead.
- Add acks
Reviewed-by Sylwester Nawrocki <[email protected]>
PATCH v2 1/1 sound: Convert to using %pOF instead of full_name
In reply to Rob HerringNow that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.
Signed-off-by Rob Herring <[email protected]>
Cc Johannes Berg <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Timur Tabi <[email protected]>
Cc Nicolin Chen <[email protected]>
Cc Xiubo Li <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
---
v2:
- Add printf specifier change for fsl_dma.c
sound/aoa/codecs/tas.c | 4 ++-- sound/soc/fsl/fsl_dma.c | 4 ++-- sound/soc/fsl/imx-audmux.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-)
sound/aoa/codecs/tas.c +2 -2
@@ -905,8 +905,8 @@ static int tas_i2c_probe(struct i2c_client *client, goto fail; }printk (KERN_DEBUG -"snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n" , - (unsigned int )client->addr, node->full_name); +"snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n" , + (unsigned int )client->addr, node);return 0 ; fail:mutex_destroy (&tas->mtx);
sound/soc/fsl/fsl_dma.c +2 -2
@@ -897,8 +897,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) ret =of_address_to_resource (ssi_np,0 , &res);if (ret) { -dev_err (&pdev->dev,"could not determine resources for %s\n" , - ssi_np->full_name); +dev_err (&pdev->dev,"could not determine resources for %pOF\n" , + ssi_np);of_node_put (ssi_np);return ret; }
sound/soc/fsl/imx-audmux.c +8 -8
@@ -268,13 +268,13 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev, ret =of_property_read_u32 (child,"fsl,audmux-port" , &port);if (ret) { -dev_warn (&pdev->dev,"Failed to get fsl,audmux-port of child node \"%s\"\n" , - child->full_name); +dev_warn (&pdev->dev,"Failed to get fsl,audmux-port of child node \"%pOF\"\n" , + child);continue ; }if (!of_property_read_bool (child,"fsl,port-config" )) { -dev_warn (&pdev->dev,"child node \"%s\" does not have property fsl,port-config\n" , - child->full_name); +dev_warn (&pdev->dev,"child node \"%pOF\" does not have property fsl,port-config\n" , + child);continue ; }
@@ -292,15 +292,15 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev, }if (ret != -EOVERFLOW ) { -dev_err (&pdev->dev,"Failed to read u32 at index %d of child %s\n" , - i, child->full_name); +dev_err (&pdev->dev,"Failed to read u32 at index %d of child %pOF\n" , + i, child);continue ; }if (audmux_type ==IMX31_AUDMUX ) {if (i %2 ) { -dev_err (&pdev->dev,"One pdcr value is missing in child node %s\n" , - child->full_name); +dev_err (&pdev->dev,"One pdcr value is missing in child node %pOF\n" , + child);continue ; }imx_audmux_v2_configure_port (port, ptcr, pdcr);
Signature · 1 line
2.11.0
Re: [PATCH v2] sound: Convert to using %pOF instead of full_name
Quoted 17 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring <[email protected]>Cc Johannes Berg <[email protected]>Cc Jaroslav Kysela <perex-/Fr2/[email protected]>Cc Takashi Iwai <tiwai-IBi9RG/[email protected]>Cc Timur Tabi <[email protected]>Cc Nicolin Chen <[email protected]>Cc Xiubo Li <[email protected]>Cc Fabio Estevam <[email protected]>Cc Liam Girdwood <[email protected]>Cc Mark Brown <[email protected]>Cc linuxppc-dev-uLR06cmDAlY/[email protected]Cc alsa-devel-K7yf7f+aM1XWsZ/[email protected]
Quoted 3 lines
---
v2:
- Add printf specifier change forfsl_dma.c
Could you split this one to the one for sound/aoa/* and one for sound/soc/fsl? It makes much easier to apply the patch, as the former goes directly to me while the latter through Mark's ASoC tree.
thanks,
Takashi
Quoted 82 lines
sound/aoa/codecs/tas.c | 4 ++-- sound/soc/fsl/fsl_dma.c | 4 ++-- sound/soc/fsl/imx-audmux.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-)sound/aoa/codecs/tas.c +2
-2@@ -905,8 +905,8 @@ static int tas_i2c_probe(struct i2c_client *client, goto fail; }printk (KERN_DEBUG -"snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n" , - (unsigned int )client->addr, node->full_name); +"snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n" , + (unsigned int )client->addr, node);return 0 ; fail:mutex_destroy (&tas->mtx);sound/soc/fsl/fsl_dma.c +2
-2@@ -897,8 +897,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) ret =of_address_to_resource (ssi_np,0 , &res);if (ret) { -dev_err (&pdev->dev,"could not determine resources for %s\n" , - ssi_np->full_name); +dev_err (&pdev->dev,"could not determine resources for %pOF\n" , + ssi_np);of_node_put (ssi_np);return ret; }sound/soc/fsl/imx-audmux.c +8
-8@@ -268,13 +268,13 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev, ret =of_property_read_u32 (child,"fsl,audmux-port" , &port);if (ret) { -dev_warn (&pdev->dev,"Failed to get fsl,audmux-port of child node \"%s\"\n" , - child->full_name); +dev_warn (&pdev->dev,"Failed to get fsl,audmux-port of child node \"%pOF\"\n" , + child);continue ; }if (!of_property_read_bool (child,"fsl,port-config" )) { -dev_warn (&pdev->dev,"child node \"%s\" does not have property fsl,port-config\n" , - child->full_name); +dev_warn (&pdev->dev,"child node \"%pOF\" does not have property fsl,port-config\n" , + child);continue ; }@@ -292,15 +292,15 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev, }if (ret != -EOVERFLOW ) { -dev_err (&pdev->dev,"Failed to read u32 at index %d of child %s\n" , - i, child->full_name); +dev_err (&pdev->dev,"Failed to read u32 at index %d of child %pOF\n" , + i, child);continue ; }if (audmux_type ==IMX31_AUDMUX ) {if (i %2 ) { -dev_err (&pdev->dev,"One pdcr value is missing in child node %s\n" , - child->full_name); +dev_err (&pdev->dev,"One pdcr value is missing in child node %pOF\n" , + child);continue ; }imx_audmux_v2_configure_port (port, ptcr, pdcr);Signature · 1 line
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/1 sound: fsl_dma: remove dma_object path member
In reply to Rob Herringdma_object.path is unused, so rather than fix it to work with DT full_name changes, just remove it.
Signed-off-by Rob Herring <[email protected]>
Cc Timur Tabi <[email protected]>
Cc Nicolin Chen <[email protected]>
Cc Xiubo Li <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
---
v2:
- Move printf specifier change to correct patch
sound/soc/fsl/fsl_dma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/fsl/fsl_dma.c +1 -3
@@ -63,7 +63,6 @@ struct dma_object {struct ccsr_dma_channel __iomem *channel;unsigned int irq;bool assigned; -char path[1 ]; };/*
@@ -903,14 +902,13 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)return ret; } - dma =kzalloc (sizeof (*dma) +strlen (np->full_name),GFP_KERNEL ); + dma =kzalloc (sizeof (*dma),GFP_KERNEL );if (!dma) {dev_err (&pdev->dev,"could not allocate dma object\n" );of_node_put (ssi_np);return -ENOMEM ; } -strcpy (dma->path, np->full_name); dma->dai.ops = &fsl_dma_ops; dma->dai.pcm_new = fsl_dma_new; dma->dai.pcm_free = fsl_dma_free_dma_buffers;
Signature · 1 line
2.11.0
Quoted 32 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Acked-by Gregory CLEMENT <[email protected]>Cc Russell King <[email protected]>Cc Kukjin Kim <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Fabio Estevam <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Tony Lindgren <[email protected]>Cc "Beno?t Cousson" <[email protected]>Cc Paul Walmsley <[email protected]>Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-samsung-soc at vger.kernel.orgCc linux-omap at vger.kernel.orgCc linux-rockchip at lists.infradead.orgCc linux-renesas-soc at vger.kernel.org---
v2:
- Merge several 2 line prints to single line.
- Add acks
...
Quoted 1 line
arch/arm/mach-imx/gpc.c | 4 ++--
Acked-by Shawn Guo <[email protected]>
Quoted 33 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Acked-by Gregory CLEMENT <[email protected]>Cc Russell King <[email protected]>Cc Kukjin Kim <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Fabio Estevam <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Tony Lindgren <[email protected]>Cc "Beno?t Cousson" <[email protected]>Cc Paul Walmsley <[email protected]>Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-samsung-soc at vger.kernel.orgCc linux-omap at vger.kernel.orgCc linux-rockchip at lists.infradead.orgCc linux-renesas-soc at vger.kernel.org---
v2:
- Merge several 2 line prints to single line.
- Add acks
Quoted 11 lines
arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm/kernel/devtree.c | 5 ++--- arch/arm/kernel/topology.c | 3 +-- arch/arm/mach-exynos/suspend.c | 7 +++---- arch/arm/mach-imx/gpc.c | 4 ++-- arch/arm/mach-mvebu/kirkwood.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++-- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- arch/arm/mach-rockchip/platsmp.c | 4 ++-- arch/arm/mach-shmobile/pm-rmobile.c | 7 +++---- 10 files changed, 20 insertions(+), 25 deletions(-)
mach-shmobile portion:
Acked-by Simon Horman <[email protected]>
Quoted 33 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Acked-by Gregory CLEMENT <[email protected]>Cc Russell King <[email protected]>Cc Kukjin Kim <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Fabio Estevam <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Tony Lindgren <[email protected]>Cc "Beno?t Cousson" <[email protected]>Cc Paul Walmsley <[email protected]>Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-samsung-soc at vger.kernel.orgCc linux-omap at vger.kernel.orgCc linux-rockchip at lists.infradead.orgCc linux-renesas-soc at vger.kernel.org---
v2:
- Merge several 2 line prints to single line.
- Add acks
Quoted 11 lines
arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm/kernel/devtree.c | 5 ++--- arch/arm/kernel/topology.c | 3 +-- arch/arm/mach-exynos/suspend.c | 7 +++---- arch/arm/mach-imx/gpc.c | 4 ++-- arch/arm/mach-mvebu/kirkwood.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++-- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- arch/arm/mach-rockchip/platsmp.c | 4 ++-- arch/arm/mach-shmobile/pm-rmobile.c | 7 +++---- 10 files changed, 20 insertions(+), 25 deletions(-)
Arnd, Olof,
Can you please apply this one.
Rob
Arnd Bergmann
AppliedQuoted 23 lines · Rob Herring
Quoted 10 lines · Rob Herring
Now that we have a custom printf format specifier, convert users of
full_nameto use %pOF instead. This is preparation to remove storing of the full path string for each node.Signed-off-by Rob Herring <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Acked-by Gregory CLEMENT <[email protected]>Quoted 11 lines
arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm/kernel/devtree.c | 5 ++--- arch/arm/kernel/topology.c | 3 +-- arch/arm/mach-exynos/suspend.c | 7 +++---- arch/arm/mach-imx/gpc.c | 4 ++-- arch/arm/mach-mvebu/kirkwood.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++-- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- arch/arm/mach-rockchip/platsmp.c | 4 ++-- arch/arm/mach-shmobile/pm-rmobile.c | 7 +++---- 10 files changed, 20 insertions(+), 25 deletions(-)
Quoted 3 lines
Arnd, Olof,
Can you please apply this one.
Applied to next/cleanup now, with the Acks. I think that should be the last patch of this series that you wanted me to apply. Can you double-check and maybe re-submit any patches I may have missed?
Arnd