Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df961c7 authored by Gustavo Solaira's avatar Gustavo Solaira Committed by Ajay Agarwal
Browse files

diag: Disable the code for diag_smux 



Disable the diag_smux code to fix the build with
diagfwd USB enabled since the dependencies for
diag_smux are not available it is deprecated in
this kernel version.
Remove the diagfwd_smux driver as it is no longer in use.
Clean the code wherever possible.

Change-Id: I6a8bc3a34f67ed5b1ca175cad0b3067e2c2df199
Signed-off-by: default avatarGustavo Solaira <gustavos@codeaurora.org>
Signed-off-by: default avatarAjay Agarwal <ajaya@codeaurora.org>
parent b8cd1590

drivers/char/diag/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ config DIAG_OVER_USB 
	  Diag traffic from the USB endpoint.



config DIAGFWD_BRIDGE_CODE

	bool "Enable QSC/9K DIAG traffic over SMUX/HSIC"

	bool "Enable remote DIAG traffic over MHI/HSIC"

	depends on DIAG_CHAR

	depends on USB_QCOM_DIAG_BRIDGE || MHI_BUS

	default y

	help

	  SMUX/HSIC Transport Layer for DIAG Router. When the MHI/SMUX endpoints

	  MHI/HSIC Transport Layer for DIAG Router. When the MHI/HSIC endpoints

	  become available, this bridge driver enables DIAG traffic over MHI

	  and SMUX.

	  and HSIC.



endmenu

drivers/char/diag/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_DIAG_CHAR) := diagchar.o

obj-$(CONFIG_DIAGFWD_BRIDGE_CODE) += diagfwd_bridge.o

obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_hsic.o

obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_smux.o

obj-$(CONFIG_MHI_BUS) += diagfwd_mhi.o

diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_peripheral.o diagfwd_socket.o diagfwd_rpmsg.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o

drivers/char/diag/diag_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#endif

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE

#include "diagfwd_hsic.h"

#include "diagfwd_smux.h"

#endif

#ifdef CONFIG_MHI_BUS

#include "diagfwd_mhi.h"

drivers/char/diag/diag_memorydevice.c

+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ struct diag_md_info diag_md[NUM_DIAG_MD_DEV] = { 
		.md_info_inited = 0,

		.tbl = NULL,

		.ops = NULL,

	},

	{

		.id = DIAG_MD_SMUX,

		.ctx = 0,

		.mempool = POOL_TYPE_QSC_MUX,

		.num_tbl_entries = 0,

		.md_info_inited = 0,

		.tbl = NULL,

		.ops = NULL,

	}

#endif

};

drivers/char/diag/diag_memorydevice.h

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
#define DIAG_MD_BRIDGE_BASE	DIAG_MD_LOCAL_LAST

#define DIAG_MD_MDM		(DIAG_MD_BRIDGE_BASE)

#define DIAG_MD_MDM2		(DIAG_MD_BRIDGE_BASE + 1)

#define DIAG_MD_SMUX		(DIAG_MD_BRIDGE_BASE + 2)

#define DIAG_MD_BRIDGE_LAST	(DIAG_MD_BRIDGE_BASE + 3)

#define DIAG_MD_BRIDGE_LAST	(DIAG_MD_BRIDGE_BASE + 2)



#ifndef CONFIG_DIAGFWD_BRIDGE_CODE

#define NUM_DIAG_MD_DEV		DIAG_MD_LOCAL_LAST