Hi Darren, On Wed, Jun 26, 2013 at 5:41 PM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote: > On 26/06/13 15:06, Prabhakar Lad wrote: >> Hi Tomi, >> >> On Wed, Jun 26, 2013 at 5:30 PM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote: >>> On 26/06/13 14:56, Prabhakar Lad wrote: >>>> Hi Tomi, >>>> >>>> On Wed, Jun 26, 2013 at 5:09 PM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote: >>>>> On 16/05/13 10:10, Lad Prabhakar wrote: >>>>>> From: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx> >>>>>> >>>>>> Use devm_ioremap_resource instead of reques_mem_region()/ioremap() and >>>>>> devm_request_irq() instead of request_irq(). >>>>>> >>>>>> This ensures more consistent error values and simplifies error paths. >>>>>> >>>>>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx> >>>>>> --- >>>>>> drivers/video/da8xx-fb.c | 39 +++++++-------------------------------- >>>>>> 1 files changed, 7 insertions(+), 32 deletions(-) >>>>> >>>>> There's something similar in Darren's da8xx-fb series. Can you check if >>>>> there are differences? >>>>> >>>> I don't see similar changes in his patch series. >>> >>> [PATCH 14/23] video: da8xx-fb: use devres >>> >> Oops missed it out :), patch is almost similar except >> for following block, >> >> - fb_clk = clk_get(&device->dev, "fck"); >> + fb_clk = devm_clk_get(&device->dev, "fck"); >> if (IS_ERR(fb_clk)) { >> dev_err(&device->dev, "Can not get device clock\n"); >> - ret = -ENODEV; >> - goto err_ioremap; >> + return -ENODEV; >> } >> >> How do you suggest to handle it ? > > I think it's easiest if Darren handles the da8xx-fb series for 3.11. So > if there's something missing from Darren's series, please discuss with him. > Either you merge this patch with yours or rebase your patch on top of my patch. Let me know how you would like to handle it ? Regards, --Prabhakar Lad -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html