[U-Boot] [PATCH] usb: f_mass_storage: Fix compile on x86

[Marek Vasut]

On 04/26/2018 06:58 PM, Bryan O'Donoghue wrote:
> On 26/04/18 16:14, Marek Vasut wrote:
>> On 04/26/2018 04:41 PM, Bryan O'Donoghue wrote:
>>> Compiling the f_mass_storage driver for an x86 target results in a
>>> compilation error as set_bit and clear_bit are provided by bitops.h
>>>
>>> Fix that now by only compiling up the local definition of set_bit and
>>> clear_bit only if not already provided by the environment.
>>>
>>> Signed-off-by: Bryan O'Donoghue <pure.logic at nexus-software.ie>
>>> Cc: Lukasz Majewski <lukma at denx.de>
>>> Cc: Marek Vasut <marex at denx.de>
>>> ---
>>>   drivers/usb/gadget/f_mass_storage.c | 2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/usb/gadget/f_mass_storage.c
>>> b/drivers/usb/gadget/f_mass_storage.c
>>> index 1ecb92ac6b..2e856af6ed 100644
>>> --- a/drivers/usb/gadget/f_mass_storage.c
>>> +++ b/drivers/usb/gadget/f_mass_storage.c
>>> @@ -283,6 +283,7 @@ static const char fsg_string_interface[] = "Mass
>>> Storage";
>>>   struct kref {int x; };
>>>   struct completion {int x; };
>>>   +#ifndef _I386_BITOPS_H
>>>   inline void set_bit(int nr, volatile void *addr)
>>>   {
>>>       int    mask;
>>> @@ -302,6 +303,7 @@ inline void clear_bit(int nr, volatile void *addr)
>>>       mask = 1 << (nr & 0x1f);
>>>       *a &= ~mask;
>>>   }
>>> +#endif /* _I386_BITOPTS_H */
>>
>> This doesn't look right, generic driver shouldn't contain arch-specific
>> fixup or ifdef. Can this be somehow abstracted out?
>>
> 
> Hmm.
> 
> On a second look - the name of these functions should change not to
> conflict with bitops.h - there's some funny bit-shifting going on there..

Better :)

-- 
Best regards,
Marek Vasut