Re: [GIT PATCH] USB patches for 3.9-rc1

Greg KH
2013-02-21T21:58:07Z

On Thu, Feb 21, 2013 at 12:25:24PM -0800, Linus Torvalds wrote:
> On Thu, Feb 21, 2013 at 10:40 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > USB patches for 3.9-rc1
> >
> > Here's the big USB merge for 3.9-rc1
> >
> > Nothing major, lots of gadget fixes, and of course, xhci stuff.
>
> Ok, so there were a couple of conflicts with Thierry Reding's series
> to convert devm_request_and_ioremap() users into
> devm_ioremap_resource(), where some of the old users had been
> converted to use other helper functions (eg omap_get_control_dev()).

That's fine.

> I left the omap_get_control_dev() users alone, but I do want to note
> that omap_control_usb_probe() itself now uses that
> devm_request_and_ioremap() function. And I did *not* extend the merge
> to do that kind of conversion in the helper function, so I'm assuming
> Thierry might want to extend his work. Assuming people care enough..

Yes, his plan was to do another sweep of the calls and hopefully remove
the old api in 3.10 or so once that is all cleaned up.

thanks,

greg k-h