Skip to content

Commit

Permalink
Revert "staging: vc04_services: Do not pass NULL to vchiq_log_error()"
Browse files Browse the repository at this point in the history
This reverts commit 896735c.
  • Loading branch information
popcornmix committed Jan 29, 2024
1 parent f434f4b commit 72efbd3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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(struct vchiq_device *device, void (*callback)(void))
void vchiq_add_connected_callback(void (*callback)(void))
{
connected_init();

Expand All @@ -39,7 +39,7 @@ void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(
callback();
} else {
if (g_num_deferred_callbacks >= MAX_CALLBACKS) {
vchiq_log_error(&device->dev, VCHIQ_CORE,
vchiq_log_error(NULL, VCHIQ_CORE,
"There already %d callback registered - please increase MAX_CALLBACKS",
g_num_deferred_callbacks);
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
/* 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(struct vchiq_device *device, void (*callback)(void));
void vchiq_add_connected_callback(void (*callback)(void));
void vchiq_call_connected_callbacks(void);

#endif /* VCHIQ_CONNECTED_H */

0 comments on commit 72efbd3

Please sign in to comment.