~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,27 +1,18 @@
	1	+// SPDX-License-Identifier: ISC
1	2	/*
2	3	* Copyright (c) 2012 Broadcom Corporation
3		- *
4		- * Permission to use, copy, modify, and/or distribute this software for any
5		- * purpose with or without fee is hereby granted, provided that the above
6		- * copyright notice and this permission notice appear in all copies.
7		- *
8		- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15	4	*/
16	5
	6	+#include <linux/device.h>
17	7	#include <linux/module.h> /* bug in tracepoint.h, it should include this */
18	8
19	9	#ifndef __CHECKER__
20	10	#define CREATE_TRACE_POINTS
	11	+#include "bus.h"
21	12	#include "tracepoint.h"
22	13	#include "debug.h"
23	14
24		-void __brcmf_err(const char func, const char fmt, ...)
	15	+void __brcmf_err(struct brcmf_bus bus, const char func, const char *fmt, ...)
25	16	{
26	17	struct va_format vaf = {
27	18	.fmt = fmt,
..	..	@@ -30,7 +21,10 @@
30	21
31	22	va_start(args, fmt);
32	23	vaf.va = &args;
33		- pr_err("%s: %pV", func, &vaf);
	24	+ if (bus)
	25	+ dev_err(bus->dev, "%s: %pV", func, &vaf);
	26	+ else
	27	+ pr_err("%s: %pV", func, &vaf);
34	28	trace_brcmf_err(func, &vaf);
35	29	va_end(args);
36	30	}