On Thu, Aug 24, 2017 at 04:37:45PM -0400, Roy Pledge wrote: > --- a/drivers/soc/fsl/qbman/bman_ccsr.c > +++ b/drivers/soc/fsl/qbman/bman_ccsr.c [...] > @@ -201,6 +202,38 @@ static int fsl_bman_probe(struct platform_device *pdev) > return -ENODEV; > } > > + /* > + * If FBPR memory wasn't defined using the qbman compatible string > + * try using the of_reserved_mem_device method > + */ > + if (!fbpr_a) { > + ret = of_reserved_mem_device_init(dev); > + if (ret) { > + dev_err(dev, "of_reserved_mem_device_init() failed > 0x%x\n", > + ret); > + return -ENODEV; > + } > + mem_node = of_parse_phandle(dev->of_node, "memory-region", 0); > + if (mem_node) { > + ret = of_property_read_u64(mem_node, "size", &size); > + if (ret) { > + dev_err(dev, "FBPR: of_address_to_resource > fails 0x%x\n", > + ret); > + return -ENODEV; > + } > + fbpr_sz = size; > + } else { > + dev_err(dev, "No memory-region found for FBPR\n"); > + return -ENODEV; > + } > + if (!dma_zalloc_coherent(dev, fbpr_sz, &fbpr_a, 0)) { > + dev_err(dev, "Alloc FBPR memory failed\n"); > + return -ENODEV; > + } > + }
At a quick look, I think I spotted this pattern a couple of more times in the subsequent patch. Could it be moved to a common function? -- Catalin