iommu: Convert to using %pOF instead of full_name
Subsystems (2)
PATCH 1/1 iommu: 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]>
Cc Joerg Roedel <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc iommu at lists.linux-foundation.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-rockchip at lists.infradead.org
--- drivers/iommu/fsl_pamu.c | 20 ++++++++------------ drivers/iommu/fsl_pamu_domain.c | 10 ++++------ drivers/iommu/of_iommu.c | 3 +-- drivers/iommu/rockchip-iommu.c | 10 +++++----- 4 files changed, 18 insertions(+), 25 deletions(-)
drivers/iommu/fsl_pamu.c +8 -12
@@ -530,8 +530,8 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)if (node) { prop =of_get_property (node,"cache-stash-id" ,NULL );if (!prop) { -pr_debug ("missing cache-stash-id at %s\n" , - node->full_name); +pr_debug ("missing cache-stash-id at %pOF\n" , + node);of_node_put (node);return ~(u32 )0 ; }
@@ -557,8 +557,8 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)if (stash_dest_hint == cache_level) { prop =of_get_property (node,"cache-stash-id" ,NULL );if (!prop) { -pr_debug ("missing cache-stash-id at %s\n" , - node->full_name); +pr_debug ("missing cache-stash-id at %pOF\n" , + node);of_node_put (node);return ~(u32 )0 ; }
@@ -568,8 +568,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu) prop =of_get_property (node,"next-level-cache" ,NULL );if (!prop) { -pr_debug ("can't find next-level-cache at %s\n" , - node->full_name); +pr_debug ("can't find next-level-cache at %pOF\n" , node);of_node_put (node);return ~(u32 )0 ;/* can't traverse any further */ }
@@ -1063,8 +1062,7 @@ static int fsl_pamu_probe(struct platform_device *pdev) guts_node =of_find_matching_node (NULL , guts_device_ids);if (!guts_node) { -dev_err (dev,"could not find GUTS node %s\n" , - dev->of_node->full_name); +dev_err (dev,"could not find GUTS node %pOF\n" , dev->of_node); ret = -ENODEV ; goto error; }
@@ -1246,8 +1244,7 @@ static __init int fsl_pamu_init(void) pdev =platform_device_alloc ("fsl-of-pamu" ,0 );if (!pdev) { -pr_err ("could not allocate device %s\n" , - np->full_name); +pr_err ("could not allocate device %pOF\n" , np); ret = -ENOMEM ; goto error_device_alloc; }
@@ -1259,8 +1256,7 @@ static __init int fsl_pamu_init(void) ret =platform_device_add (pdev);if (ret) { -pr_err ("could not add device %s (err=%i)\n" , - np->full_name, ret); +pr_err ("could not add device %pOF (err=%i)\n" , np, ret); goto error_device_add; }
drivers/iommu/fsl_pamu_domain.c +4 -6
@@ -619,8 +619,8 @@ static int handle_attach_device(struct fsl_dma_domain *dma_domain,for (i =0 ; i < num; i++) {/* Ensure that LIODN value is valid */ if (liodn[i] >=PAACE_NUMBER_ENTRIES ) { -pr_debug ("Invalid liodn %d, attach device failed for %s\n" , - liodn[i], dev->of_node->full_name); +pr_debug ("Invalid liodn %d, attach device failed for %pOF\n" , + liodn[i], dev->of_node); ret = -EINVAL ;break ; }
@@ -684,8 +684,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain, liodn_cnt = len /sizeof (u32); ret =handle_attach_device (dma_domain, dev, liodn, liodn_cnt); }else { -pr_debug ("missing fsl,liodn property at %s\n" , - dev->of_node->full_name); +pr_debug ("missing fsl,liodn property at %pOF\n" , dev->of_node); ret = -EINVAL ; }
@@ -720,8 +719,7 @@ static void fsl_pamu_detach_device(struct iommu_domain *domain,if (prop)detach_device (dev, dma_domain);else -pr_debug ("missing fsl,liodn property at %s\n" , - dev->of_node->full_name); +pr_debug ("missing fsl,liodn property at %pOF\n" , dev->of_node); }static int configure_domain_geometry (struct iommu_domain *domain,void *data)
drivers/iommu/of_iommu.c +1 -2
@@ -255,8 +255,7 @@ static int __init of_iommu_init(void)const of_iommu_init_fn init_fn = match->data;if (init_fn &&init_fn (np)) -pr_err ("Failed to initialise IOMMU %s\n" , -of_node_full_name (np)); +pr_err ("Failed to initialise IOMMU %pOF\n" , np); }return 0 ;
drivers/iommu/rockchip-iommu.c +5 -5
@@ -1008,20 +1008,20 @@ static int rk_iommu_group_set_iommudata(struct iommu_group *group, ret =of_parse_phandle_with_args (np,"iommus" ,"#iommu-cells" ,0 , &args);if (ret) { -dev_err (dev,"of_parse_phandle_with_args(%s) => %d\n" , - np->full_name, ret); +dev_err (dev,"of_parse_phandle_with_args(%pOF) => %d\n" , + np, ret);return ret; }if (args.args_count !=0 ) { -dev_err (dev,"incorrect number of iommu params found for %s (found %d, expected 0)\n" , - args.np->full_name, args.args_count); +dev_err (dev,"incorrect number of iommu params found for %pOF (found %d, expected 0)\n" , + args.np, args.args_count);return -EINVAL ; } pd =of_find_device_by_node (args.np);of_node_put (args.np);if (!pd) { -dev_err (dev,"iommu %s not found\n" , args.np->full_name); +dev_err (dev,"iommu %pOF not found\n" , args.np);return -EPROBE_DEFER ; }
--
2.11.0
Am Dienstag, 18. Juli 2017, 16:43:09 CEST schrieb Rob Herring:
Quoted 4 lines
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.
Quoted 8 lines
Signed-off-by Rob Herring <[email protected]>Cc Joerg Roedel <[email protected]>Cc Heiko Stuebner <[email protected]>Cc iommu at lists.linux-foundation.orgCc linux-arm-kernel at lists.infradead.orgCc linux-rockchip at lists.infradead.org--- drivers/iommu/rockchip-iommu.c | 10 +++++-----
for the Rockchip-related part
Reviewed-by Heiko Stuebner <[email protected]>
Quoted 35 lines
drivers/iommu/rockchip-iommu.c +5
-6@@ -1008,20 +1008,20 @@ static int rk_iommu_group_set_iommudata(struct iommu_group *group, ret =of_parse_phandle_with_args (np,"iommus" ,"#iommu-cells" ,0 , &args);if (ret) { -dev_err (dev,"of_parse_phandle_with_args(%s) => %d\n" , - np->full_name, ret); +dev_err (dev,"of_parse_phandle_with_args(%pOF) => %d\n" , + np, ret);return ret; }if (args.args_count !=0 ) { -dev_err (dev,"incorrect number of iommu params found for %s (found %d, expected 0)\n" , - args.np->full_name, args.args_count); +dev_err (dev,"incorrect number of iommu params found for %pOF (found %d, expected 0)\n" , + args.np, args.args_count);return -EINVAL ; } pd =of_find_device_by_node (args.np);of_node_put (args.np);if (!pd) { -dev_err (dev,"iommu %s not found\n" , args.np->full_name); +dev_err (dev,"iommu %pOF not found\n" , args.np);return -EPROBE_DEFER ; } --2.11.0
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]>Cc Joerg Roedel <[email protected]>Cc Heiko Stuebner <[email protected]>Cc iommu at lists.linux-foundation.orgCc linux-arm-kernel at lists.infradead.orgCc linux-rockchip at lists.infradead.org
Quoted 6 lines
--- drivers/iommu/fsl_pamu.c | 20 ++++++++------------ drivers/iommu/fsl_pamu_domain.c | 10 ++++------ drivers/iommu/of_iommu.c | 3 +-- drivers/iommu/rockchip-iommu.c | 10 +++++----- 4 files changed, 18 insertions(+), 25 deletions(-)
Applied, thanks.