powerpc: fsl: Use of_property_read_reg() to parse "reg"
PATCH 1/1 powerpc: fsl: Use of_property_read_reg() to parse "reg"
Use the recently added of_property_read_reg() helper to get the untranslated "reg" address value.
Signed-off-by Rob Herring <[email protected]>
--- arch/powerpc/sysdev/fsl_rio.c | 14 +++----------- arch/powerpc/sysdev/fsl_rmu.c | 9 +-------- 2 files changed, 4 insertions(+), 19 deletions(-)
arch/powerpc/sysdev/fsl_rio.c +3 -11
@@ -448,13 +448,11 @@ int fsl_rio_setup(struct platform_device *dev)struct rio_mport *port;struct rio_priv *priv;int rc =0 ; -const u32 *dt_range, *cell, *port_index; +const u32 *cell, *port_index;u32 active_ports =0 ;struct device_node *np, *rmu_node; -int rlen;u32 ccsr;u64 range_start; -int aw;u32 i;static int tmp;struct device_node *rmu_np[MAX_MSG_UNIT_NUM ] = {NULL };
@@ -528,15 +526,12 @@ int fsl_rio_setup(struct platform_device *dev) dbell->bellirq =irq_of_parse_and_map (np,1 );dev_info (&dev->dev,"bellirq: %d\n" , dbell->bellirq); - aw =of_n_addr_cells (np); - dt_range =of_get_property (np,"reg" , &rlen); -if (!dt_range) { +if (of_property_read_reg (np,0 , &range_start,NULL )) {pr_err ("%pOF: unable to find 'reg' property\n" , np); rc = -ENOMEM ; goto err_pw; } - range_start =of_read_number (dt_range, aw); dbell->dbell_regs = (struct rio_dbell_regs *)(rmu_regs_win + (u32 )range_start);
@@ -556,15 +551,12 @@ int fsl_rio_setup(struct platform_device *dev) pw->dev = &dev->dev; pw->pwirq =irq_of_parse_and_map (np,0 );dev_info (&dev->dev,"pwirq: %d\n" , pw->pwirq); - aw =of_n_addr_cells (np); - dt_range =of_get_property (np,"reg" , &rlen); -if (!dt_range) { +if (of_property_read_reg (np,0 , &range_start,NULL )) {pr_err ("%pOF: unable to find 'reg' property\n" , np); rc = -ENOMEM ; goto err; } - range_start =of_read_number (dt_range, aw); pw->pw_regs = (struct rio_pw_regs *)(rmu_regs_win + (u32 )range_start);/*set up ports node*/
arch/powerpc/sysdev/fsl_rmu.c +1 -8
@@ -1067,9 +1067,6 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)struct rio_priv *priv;struct fsl_rmu *rmu;u64 msg_start; -const u32 *msg_addr; -int mlen; -int aw;if (!mport || !mport->priv)return -EINVAL ;
@@ -1086,16 +1083,12 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)if (!rmu)return -ENOMEM ; - aw =of_n_addr_cells (node); - msg_addr =of_get_property (node,"reg" , &mlen); -if (!msg_addr) { +if (of_property_read_reg (node,0 , &msg_start,NULL )) {pr_err ("%pOF: unable to find 'reg' property of message-unit\n" , node);kfree (rmu);return -ENOMEM ; } - msg_start =of_read_number (msg_addr, aw); - rmu->msg_regs = (struct rio_msg_regs *) (rmu_regs_win + (u32 )msg_start);
Signature · 1 line
2.39.2
Michael Ellerman
AppliedQuoted 4 lines · Rob Herring
Use the recently added
of_property_read_reg()helper to get the untranslated "reg" address value.
Applied to powerpc/next.
[1/1] powerpc: fsl: Use of_property_read_reg() to parse "reg"
https://git.kernel.org/powerpc/c/f892ac774b34a769318030f5febe5ce41d6e122e
cheers