[PATCH 2/2] ARM: OMAP2+: move gpmc headers to include/linux/platform_data
Javier Martinez Canillas
javier.martinez at collabora.co.uk
Tue Nov 12 19:05:05 EST 2013
On 11/12/2013 11:12 PM, Tony Lindgren wrote:
> * Javier Martinez Canillas <javier.martinez at collabora.co.uk> [131112 13:58]:
>> On 11/12/2013 09:51 PM, Ezequiel Garcia wrote:
>> >
>> > I'm not too convinced about the above diffstat. Maybe you can try a
>> > a better approach of making the move by: 1) renaming/moving a file,
>> > using 'git format-patch -M' and 2) then make the necessary changes
>> > in the new place.
>> >
>> > Or, if the above ends up not fully bisectable you can try first (2)
>> > then (1).
>> >
>> > What bothers me most is seeing things like this:
>> >
>> > arch/arm/mach-omap2/gpmc-nand.h | 27 ---
>> > arch/arm/mach-omap2/gpmc.h | 231 -----------------------
>> > include/linux/platform_data/gpmc-nand-omap.h | 27 +++
>> > include/linux/platform_data/gpmc-omap.h | 231 +++++++++++++++++++++++
>> >
>> > What do you think?
>> >
>>
>> Agreed, I completely forgot about -M when generating the patches.
>>
>> I'll wait to see what Tony thinks about this approach to take the gpmc driver
>> outside of mach-omap2 and send a v2 addressing the issues you pointed out.
>
Hi Tony,
> Well the headers in include/linux/platform_data should only
> contain platform data passed to the driver. So you should
> keep arch/arm/mach-omap2 specific stuff in the local headers,
> then have the driver specific stuff private to the drivers,
> and then have separate minimal platform data headers.
>
Thanks a lot for the explanation. It wasn't clear to me before what should be
included in include/linux/platform_data and what should be kept in
arch/arm/mach-omap2.
> Please also try to avoid patching all the board-*.c files if
> possible by keeping the the local headers in place as the board
> files will be going away for v3.14 anyways. You can include
> the new platform data header from those local files as that
> cuts down extra churn in the board-*.c files a bit ;)
>
Yes, In fact I guess is just better to wait after v3.14 (when board files are
finally removed) in order to avoid unnecessary merge conflicts :)
> Regards,
>
> Tony
>
Best regards,
Javier
More information about the linux-arm-kernel
mailing list