Re: [PATCH 7/7 v9] can/peak_usb: add support for PEAK new CANFD USB adapters

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 27.01.2015 14:25, Stephane Grosjean wrote:
>
> Le 27/01/2015 14:10, Oliver Hartkopp a écrit :
>> Hi Stephane, Marc,
>>
>> On 27.01.2015 14:02, Stephane Grosjean wrote:
>>
>>> But putting "const" here leads to several other changes in pcan_usb_core.h and
>>> pcan_usb_core.c (as well as in older pcan_usb.c and pcan_usb_pro.c files,
>>> where same struct peak_adapter static objects are used to define the
>>> corresponding USB adapter).
>>>
>>> Do you need another patch which does this, once for all?
>>
>> I would suggest the following:
>>
>> 1. Send a new patch set where the CAN_CTRLMODE_FD_NON_ISO is set as discussed
>
> ? AFAIU, the discussion has stopped with:
>
>> Yes, check the firmware version and set ctrlmode directly.


As there is no firmware version to check against right now:

In pcan_usb_fd_init() just set

pdev->dev.can.ctrlmode = CAN_CTRLMODE_FD_NON_ISO;

Right before the comment '/* tell the hardware ...'

Here:
http://git.kernel.org/cgit/linux/kernel/git/mkl/linux-can-next.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_fd.c?h=peak-next#n861

That's all for the v10 patchset IMO.

>
> Then, what kind of patch do you want me to send, please?
>
>> 2. Marc: Please put these patches into peak-next branch as it was
>> 3. Plan the conversion to constify the struct for 3.21
>>
>> IMO it makes more sense to make this in the next next-net cycle.
>
> Not clear again, sorry: what do u mean with "this" ? The ISO/NO_ISO stuff or
> Adding the "const" specifier to all source files with "struct
> peak_usb_adapter" ???

Setting

pdev->dev.can.ctrlmode = CAN_CTRLMODE_FD_NON_ISO;

is mandatory.

But constify the struct peak_usb_adapter can be done later.

ok?

Regards,
Oliver

ps. I hope pdev->dev.can.ctrlmode is valid in pcan_usb_fd_init() ?!?