Commit 149261d3 authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman

staging: vc04_services: Do not pass NULL to vchiq_log_error()

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: 1d8915cf ("staging: vc04: Convert vchiq_log_error() to use dynamic debug")
Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Link: https://lore.kernel.org/r/20231128201926.489269-2-umang.jain@ideasonboard.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9c42898
...@@ -27,7 +27,7 @@ static void connected_init(void) ...@@ -27,7 +27,7 @@ static void connected_init(void)
* be made immediately, otherwise it will be deferred until * be made immediately, otherwise it will be deferred until
* vchiq_call_connected_callbacks is called. * 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))
{ {
connected_init(); connected_init();
...@@ -39,7 +39,7 @@ void vchiq_add_connected_callback(void (*callback)(void)) ...@@ -39,7 +39,7 @@ void vchiq_add_connected_callback(void (*callback)(void))
callback(); callback();
} else { } else {
if (g_num_deferred_callbacks >= MAX_CALLBACKS) { 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", "There already %d callback registered - please increase MAX_CALLBACKS",
g_num_deferred_callbacks); g_num_deferred_callbacks);
} else { } else {
......
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */ /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
#include "vchiq_bus.h"
#ifndef VCHIQ_CONNECTED_H #ifndef VCHIQ_CONNECTED_H
#define 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); void vchiq_call_connected_callbacks(void);
#endif /* VCHIQ_CONNECTED_H */ #endif /* VCHIQ_CONNECTED_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment