Merge "msm: ipa: Fix compilation errors when CONFIG_DEBUG_FS is disable" (d331359f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c

+6 −3

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

		#include <linux/debugfs.h>
		@@ -57,15 +57,18 @@
		} while (0)

		#define IPA_GSB_MAX_MSG_LEN 512

		#ifdef CONFIG_DEBUG_FS
		static struct dentry *dent;
		static struct dentry *dfile_stats;
		static char dbg_buff[IPA_GSB_MAX_MSG_LEN];
		#endif

		#define IPA_GSB_SKB_HEADROOM 256
		#define IPA_GSB_SKB_DUMMY_HEADER 42
		#define IPA_GSB_AGGR_BYTE_LIMIT 14
		#define IPA_GSB_AGGR_TIME_LIMIT 1000 /* 1000 us */

		static struct dentry *dent;
		static struct dentry *dfile_stats;

		/**
		* struct stats - driver statistics,

+8 −6

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/debugfs.h>
		@@ -147,11 +147,6 @@ struct ipa_mhi_client_ctx {
		static struct ipa_mhi_client_ctx *ipa_mhi_client_ctx;
		static DEFINE_MUTEX(mhi_client_general_mutex);

		#ifdef CONFIG_DEBUG_FS
		#define IPA_MHI_MAX_MSG_LEN 512
		static char dbg_buff[IPA_MHI_MAX_MSG_LEN];
		static struct dentry *dent;

		static char *ipa_mhi_channel_state_str[] = {
		__stringify(IPA_HW_MHI_CHANNEL_STATE_DISABLE),
		__stringify(IPA_HW_MHI_CHANNEL_STATE_ENABLE),
		@@ -262,6 +257,11 @@ static int ipa_mhi_read_write_host(enum ipa_mhi_dma_dir dir, void *dev_addr,
		return res;
		}

		#ifdef CONFIG_DEBUG_FS
		#define IPA_MHI_MAX_MSG_LEN 512
		static char dbg_buff[IPA_MHI_MAX_MSG_LEN];
		static struct dentry *dent;

		static int ipa_mhi_print_channel_info(struct ipa_mhi_channel_ctx *channel,
		char *buff, int len)
		{
		@@ -2184,10 +2184,12 @@ int ipa_mhi_destroy_all_channels(void)
		return 0;
		}

		#ifdef CONFIG_DEBUG_FS
		static void ipa_mhi_debugfs_destroy(void)
		{
		debugfs_remove_recursive(dent);
		}
		#endif

		static void ipa_mhi_deregister_pm(void)
		{