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

Commit f1c602f9 authored by Sean MacLennan's avatar Sean MacLennan Committed by Greg Kroah-Hartman
Browse files

rtl8192e: move RTL_DEBUG and proc prototypes 



The RTL_DEBUG enum is used for rt_global_debug_component global
variable and RT_TRACE. It should be in rtl_debug.h and not rtl_core.h.

The rtl8192_proc_* functions are r8192 specific and should not be in
rtl_debug.h. Move them to rtl_core.h.

Signed-off-by: default avatarSean MacLennan <seanm@seanm.ca>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80c0d83a

drivers/staging/rtl8192e/rtl_core.h

+6 −35
Original line number Diff line number Diff line
@@ -215,41 +215,6 @@ enum RTL819x_PHY_PARAM { 
	RTL819X_EFUSE_MAP			= 19,

};



enum RTL_DEBUG {

	COMP_TRACE		= BIT0,

	COMP_DBG		= BIT1,

	COMP_INIT		= BIT2,

	COMP_RECV		= BIT3,

	COMP_SEND		= BIT4,

	COMP_CMD		= BIT5,

	COMP_POWER		= BIT6,

	COMP_EPROM		= BIT7,

	COMP_SWBW		= BIT8,

	COMP_SEC		= BIT9,

	COMP_LPS		= BIT10,

	COMP_QOS		= BIT11,

	COMP_RATE		= BIT12,

	COMP_RXDESC		= BIT13,

	COMP_PHY		= BIT14,

	COMP_DIG		= BIT15,

	COMP_TXAGC		= BIT16,

	COMP_HALDM		= BIT17,

	COMP_POWER_TRACKING	= BIT18,

	COMP_CH			= BIT19,

	COMP_RF			= BIT20,

	COMP_FIRMWARE		= BIT21,

	COMP_HT			= BIT22,

	COMP_RESET		= BIT23,

	COMP_CMDPKT		= BIT24,

	COMP_SCAN		= BIT25,

	COMP_PS			= BIT26,

	COMP_DOWN		= BIT27,

	COMP_INTR		= BIT28,

	COMP_LED		= BIT29,

	COMP_MLME		= BIT30,

	COMP_ERR		= BIT31

};



enum nic_t {

	NIC_UNKNOWN     = 0,

	NIC_8192E       = 1,
@@ -1121,4 +1086,10 @@ void ActUpdateChannelAccessSetting(struct net_device *dev, 
			   enum wireless_mode WirelessMode,

			   struct channel_access_setting *ChnlAccessSetting);



/* proc stuff from rtl_debug.c */

void rtl8192_proc_init_one(struct net_device *dev);

void rtl8192_proc_remove_one(struct net_device *dev);

void rtl8192_proc_module_init(void);

void rtl8192_proc_module_remove(void);



#endif

drivers/staging/rtl8192e/rtl_debug.h

+36 −6
Original line number Diff line number Diff line
@@ -29,6 +29,42 @@ 


extern u32 rt_global_debug_component;



/* These are the defines for rt_global_debug_component */

enum RTL_DEBUG {

	COMP_TRACE		= (1 << 0),

	COMP_DBG		= (1 << 1),

	COMP_INIT		= (1 << 2),

	COMP_RECV		= (1 << 3),

	COMP_SEND		= (1 << 4),

	COMP_CMD		= (1 << 5),

	COMP_POWER		= (1 << 6),

	COMP_EPROM		= (1 << 7),

	COMP_SWBW		= (1 << 8),

	COMP_SEC		= (1 << 9),

	COMP_LPS		= (1 << 10),

	COMP_QOS		= (1 << 11),

	COMP_RATE		= (1 << 12),

	COMP_RXDESC		= (1 << 13),

	COMP_PHY		= (1 << 14),

	COMP_DIG		= (1 << 15),

	COMP_TXAGC		= (1 << 16),

	COMP_HALDM		= (1 << 17),

	COMP_POWER_TRACKING	= (1 << 18),

	COMP_CH			= (1 << 19),

	COMP_RF			= (1 << 20),

	COMP_FIRMWARE		= (1 << 21),

	COMP_HT			= (1 << 22),

	COMP_RESET		= (1 << 23),

	COMP_CMDPKT		= (1 << 24),

	COMP_SCAN		= (1 << 25),

	COMP_PS			= (1 << 26),

	COMP_DOWN		= (1 << 27),

	COMP_INTR		= (1 << 28),

	COMP_LED		= (1 << 29),

	COMP_MLME		= (1 << 30),

	COMP_ERR		= (1 << 31)

};



#define RT_TRACE(component, x, args...)		\

do {			\

	if (rt_global_debug_component & component) \
@@ -42,10 +78,4 @@ do { \ 
		#expr, __FILE__, __func__, __LINE__);	  \

	}



/* proc stuff */

void rtl8192_proc_init_one(struct net_device *dev);

void rtl8192_proc_remove_one(struct net_device *dev);

void rtl8192_proc_module_init(void);

void rtl8192_proc_module_remove(void);



#endif