[PATCH v2 20/23] at91: Make high speed USB gadget device common

[H Hartley Sweeten]

On Thursday, April 21, 2011 2:28 PM, Ryan Mallon wrote:
> On 22/04/11 09:21, H Hartley Sweeten wrote:
>> On Wednesday, April 20, 2011 10:42 PM, Ryan Mallon wrote:
>>>
>>> Replace the individual high-speed UDC code for each at91 variant with
>>> a single implementation in devices.c
>>>
>>> Signed-off-by: Ryan Mallon <ryan at bluewatersys.com>
>>> ---
>>>  arch/arm/mach-at91/at91cap9_devices.c    |  114 ++++++------------------------
>>>  arch/arm/mach-at91/at91sam9g45_devices.c |   94 ++++---------------------
>>>  arch/arm/mach-at91/at91sam9rl_devices.c  |  100 ++++----------------------
>>>  arch/arm/mach-at91/devices.c             |   79 +++++++++++++++++++++
>>>  arch/arm/mach-at91/devices.h             |   20 +++++
>>>  5 files changed, 150 insertions(+), 257 deletions(-)
>> 
>> Thanks for sending part 12/23 of the series.
>> 
>> I tried applying all of the patches to linux-next and got this on part 20/23:
>> 
>> patching file arch/arm/mach-at91/at91cap9_devices.c
>> Hunk #1 FAILED at 51.
>> 1 out of 2 hunks FAILED -- saving rejects to file arch/arm/mach-at91/at91cap9_devices.c.rej
>> patching file arch/arm/mach-at91/at91sam9g45_devices.c
>> Hunk #1 FAILED at 66.
>> 1 out of 2 hunks FAILED -- saving rejects to file arch/arm/mach-at91/at91sam9g45_devices.c.rej
>> patching file arch/arm/mach-at91/at91sam9rl_devices.c
>> Hunk #1 FAILED at 40.
>> 1 out of 2 hunks FAILED -- saving rejects to file arch/arm/mach-at91/at91sam9rl_devices.c.rej
>> patching file arch/arm/mach-at91/devices.c
>> patching file arch/arm/mach-at91/devices.h
>> 
>> 
>> What kernel should this apply to?
>
> It should apply on top of 2.6.39-rc1. I can rebase it on top of -next if
> needed.

Found the cause of the problem in linux-next:

commit 6eab04a87677a37cf15b52e2b4b4fd57917102ad
Author: Justin P. Mattock <justinmattock at gmail.com>
Date:   Fri Apr 8 19:49:08 2011 -0700

    treewide: remove extra semicolons
    
    Signed-off-by: Justin P. Mattock <justinmattock at gmail.com>
    Signed-off-by: Jiri Kosina <jkosina at suse.cz>

I just tweeked your existing patch to get it to apply cleanly.

I'll try to do a full review now that I have all the pieces.

Thanks,
Hartley