On Thu, Feb 21, 2013 at 01:58:39PM -0800, Greg KH wrote: > 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@xxxxxxxxxxxxxxxxxxx> 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. Given that even devm_request_and_ioremap() is rather new and people have been busy sending patches to use it I had expected that the initial series wouldn't catch all uses once it had been merged. grepping is easy and I even have a semantic patch to help with the conversion so I'll keep an eye out for any new occurrences. Thierry
Attachment:
pgp_g5bNyWaN2.pgp
Description: PGP signature