Re: [PATCH 07/14] media: omap3isp: remove unused clkdev

Laurent Pinchart
2015-04-07T14:38:41Z

Hi Russell,

On Tuesday 07 April 2015 13:45:36 Russell King - ARM Linux wrote:
> On Tue, Apr 07, 2015 at 12:42:52PM +0300, Laurent Pinchart wrote:
> > On Sunday 05 April 2015 15:20:34 Russell King - ARM Linux wrote:
> > > On Sat, Apr 04, 2015 at 12:44:35AM +0300, Laurent Pinchart wrote:
> > > > Hi Russell,
> > > >
> > > > Thank you for the patch;
> > > >
> > > > On Friday 03 April 2015 18:12:58 Russell King wrote:
> > > > > No merged platform supplies xclks via platform data. As we want to
> > > > > slightly change the clkdev interface, rather than fixing this unused
> > > > > code, remove it instead.
> > > > >
> > > > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > > >
> > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > >
> > > > with one caveat though : it conflicts with patches queued for v4.1 in
> > > > the media tree. I'll post a rebased version in a reply to your e-mail.
> > > > How would you like to handle the conflict ?
> > >
> > > How bad is the conflict?
> >
> > It's not too bad, it's mostly a context-related conflict. There are two
> > additional lines to remove (plus the associated comment) from
> > isp_xclk_init(), as your patch makes a loop now terminate with if
> > (condition) continue;. Those two lines could be removed later, keeping
> > them doesn't break anything.
>
> I think it's fine to take it through the media tree as the series doesn't
> have any dependencies on this patch. It was merely attempting to get rid
> of stuff so that we could move closer to clkdev dealing with a clk_hw
> rather than a struct clk - but I never made it that far with the series.
> Maybe at a later date... :)

:-) I'll take the patch and send a pull request.

--
Regards,

Laurent Pinchart