Skip to content

Commit 72efbd3

Browse files
committed
Revert "staging: vc04_services: Do not pass NULL to vchiq_log_error()"
This reverts commit 896735c.
1 parent f434f4b commit 72efbd3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void connected_init(void)
2727
* be made immediately, otherwise it will be deferred until
2828
* vchiq_call_connected_callbacks is called.
2929
*/
30-
void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(void))
30+
void vchiq_add_connected_callback(void (*callback)(void))
3131
{
3232
connected_init();
3333

@@ -39,7 +39,7 @@ void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(
3939
callback();
4040
} else {
4141
if (g_num_deferred_callbacks >= MAX_CALLBACKS) {
42-
vchiq_log_error(&device->dev, VCHIQ_CORE,
42+
vchiq_log_error(NULL, VCHIQ_CORE,
4343
"There already %d callback registered - please increase MAX_CALLBACKS",
4444
g_num_deferred_callbacks);
4545
} else {
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
22
/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
33

4-
#include "vchiq_bus.h"
5-
64
#ifndef VCHIQ_CONNECTED_H
75
#define VCHIQ_CONNECTED_H
86

9-
void vchiq_add_connected_callback(struct vchiq_device *device, void (*callback)(void));
7+
void vchiq_add_connected_callback(void (*callback)(void));
108
void vchiq_call_connected_callbacks(void);
119

1210
#endif /* VCHIQ_CONNECTED_H */

0 commit comments

Comments
 (0)