Merge "gsi: fix compilation when CONFIG_DEBUG_FS is disabled" (d758903f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/ath/wil6210/wil6210.h

+6 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: ISC */
		/*
		* Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef __WIL6210_H__
		@@ -1415,6 +1415,11 @@ void wil6210_debugfs_remove(struct wil6210_priv *wil);
		#else
		static inline int wil6210_debugfs_init(struct wil6210_priv *wil) { return 0; }
		static inline void wil6210_debugfs_remove(struct wil6210_priv *wil) {}
		static inline int wil_led_blink_set(struct wil6210_priv *wil,
		const char *buf)
		{
		return 0;
		}
		#endif

		int wil6210_sysfs_init(struct wil6210_priv *wil);

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only

		gsidbg-$(CONFIG_DEBUG_FS) += gsi_dbg.o
		gsidbg-$(CONFIG_GSI) += gsi_dbg.o
		obj-$(CONFIG_GSI) += gsi.o gsidbg.o

		obj-$(CONFIG_IPA_EMULATION) += gsi_emulation.o

+5 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/completion.h>
		@@ -19,7 +19,9 @@
		#define PRT_STAT(fmt, args...) \
		pr_err(fmt, ## args)

		#ifdef CONFIG_DEBUG_FS
		static struct dentry *dent;
		#endif
		static char dbg_buff[4096];
		static void *gsi_ipc_logbuf_low;

		@@ -670,6 +672,7 @@ const struct file_operations gsi_ipc_low_ops = {
		.write = gsi_enable_ipc_low,
		};

		#ifdef CONFIG_DEBUG_FS
		void gsi_debugfs_init(void)
		{
		static struct dentry *dfile;
		@@ -741,4 +744,5 @@ void gsi_debugfs_init(void)
		fail:
		debugfs_remove_recursive(dent);
		}
		#endif

+1 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2010-2012, 2014-2019, The Linux Foundation. All rights
		* Copyright (c) 2010-2012, 2014-2020, The Linux Foundation. All rights
		*/

		#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__
		@@ -21,7 +21,6 @@
		#include "msm_bus_core.h"
		#include "msm_bus_adhoc.h"

		#define CREATE_TRACE_POINTS
		#include <trace/events/trace_msm_bus.h>

		#define MAX_BUFF_SIZE 4096

+1 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__
		@@ -21,7 +21,6 @@
		#include "msm_bus_core.h"
		#include "msm_bus_rpmh.h"

		#define CREATE_TRACE_POINTS
		#include <trace/events/trace_msm_bus.h>

		#define MAX_BUFF_SIZE 4096