Re: [PATCH 5/9] staging: vc04_services: Do not pass NULL to vchiq_log_error()

Umang Jain
2023-11-07T12:45:35Z

Hi Laurent,

On 11/7/23 5:55 PM, Laurent Pinchart wrote:
> Hi Umang,
>
> Thank you for the patch.
>
> On Tue, Nov 07, 2023 at 04:51:52AM -0500, Umang Jain wrote:
>> vchiq_add_connected_callback() logs using vchiq_log_error() macro,
>> but passes NULL instead of a struct device pointer. Fix it.
>>
>> vchiq_add_connected_callback() is not used anywhere in the vc04_services
>> as of now. It will be used when we add new drivers(VC shared memory and
>> bcm2835-isp), hence it kept as it is for now.
>>
>> Fixes: 1d8915cf8899 ("staging: vc04: Convert vchiq_log_error() to use dynamic debug")
>> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
>> ---
>> .../vc04_services/interface/vchiq_arm/vchiq_connected.c | 4 ++--
>> .../vc04_services/interface/vchiq_arm/vchiq_connected.h | 4 +++-
>> 2 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
>> index b3928bd8c9c6..21f9fa1a1713 100644
>> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
>> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
>> @@ -27,7 +27,7 @@ static void connected_init(void)
>> * be made immediately, otherwise it will be deferred until
>> * vchiq_call_connected_callbacks is called.
>> */
>> -void vchiq_add_connected_callback(void (*callback)(void))
>> +void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(void))
> You're changing the prototype of the function, but the patch doesn't
> update any user. If the function is unused, it looks like you can drop
> it instead. Looking at the rest of the vchiq_connected.c file, I think
> you can actually drop the whole file.

I mentioned in the commit message of this patch. There will be users in
the near future.
>
>> {
>> connected_init();
>>
>> @@ -39,7 +39,7 @@ void vchiq_add_connected_callback(void (*callback)(void))
>> callback();
>> } else {
>> if (g_num_deferred_callbacks >= MAX_CALLBACKS) {
>> - vchiq_log_error(NULL, VCHIQ_CORE,
>> + vchiq_log_error(&device->dev, VCHIQ_CORE,
>> "There already %d callback registered - please increase MAX_CALLBACKS",
>> g_num_deferred_callbacks);
>> } else {
>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h
>> index 4caf5e30099d..e4ed56446f8a 100644
>> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h
>> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h
>> @@ -1,10 +1,12 @@
>> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
>> /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
>>
>> +#include "vchiq_bus.h"
>> +
>> #ifndef VCHIQ_CONNECTED_H
>> #define VCHIQ_CONNECTED_H
>>
>> -void vchiq_add_connected_callback(void (*callback)(void));
>> +void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(void));
>> void vchiq_call_connected_callbacks(void);
>>
>> #endif /* VCHIQ_CONNECTED_H */