From 1c630c8e3d743a8797e8d65f596a568db6c0ae6e Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Mon, 20 Jan 2020 11:10:43 -0800 Subject: [PATCH] net: cnss2: Build generic netlink support by default Remove cnss2 generic netlink feature build from debug config since it is needed for default builds. Change-Id: Ia746232b451c7ea794bcd0ec6f270026a0b63133 Signed-off-by: Manikandan Mohan --- drivers/net/wireless/cnss2/Makefile | 2 +- drivers/net/wireless/cnss2/genl.h | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/cnss2/Makefile b/drivers/net/wireless/cnss2/Makefile index 023cefce9399..c6d55eed00c6 100644 --- a/drivers/net/wireless/cnss2/Makefile +++ b/drivers/net/wireless/cnss2/Makefile @@ -7,5 +7,5 @@ cnss2-y += bus.o cnss2-y += debug.o cnss2-y += pci.o cnss2-y += power.o -cnss2-$(CONFIG_CNSS2_DEBUG) += genl.o +cnss2-y += genl.o cnss2-$(CONFIG_CNSS2_QMI) += qmi.o wlan_firmware_service_v01.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o diff --git a/drivers/net/wireless/cnss2/genl.h b/drivers/net/wireless/cnss2/genl.h index 33ca30a9ac06..d38ba5d315ba 100644 --- a/drivers/net/wireless/cnss2/genl.h +++ b/drivers/net/wireless/cnss2/genl.h @@ -1,5 +1,5 @@ /* 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. */ #ifndef __CNSS_GENL_H__ #define __CNSS_GENL_H__ @@ -9,26 +9,9 @@ enum cnss_genl_msg_type { CNSS_GENL_MSG_TYPE_QDSS, }; -#ifdef CONFIG_CNSS2_DEBUG int cnss_genl_init(void); void cnss_genl_exit(void); int cnss_genl_send_msg(void *buff, u8 type, char *file_name, u32 total_size); -#else -static inline int cnss_genl_init(void) -{ - return 0; -} - -static inline void cnss_genl_exit(void) -{ -} - -static inline int cnss_genl_send_msg(void *buff, u8 type, - char *file_name, u32 total_size) -{ - return 0; -} -#endif #endif