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

Commit 36925e52 authored by Joe Perches's avatar Joe Perches Committed by Kalle Valo
Browse files

mwifiex: Make mwifiex_dbg a function, reduce object size 



The mwifiex_dbg macro has two tests that could be consolidated
into a function reducing overall object size ~10KB (~4%).

So convert the macro into a function.

$ size drivers/net/wireless/mwifiex/built-in.o* (x86-64 defconfig)
   text	   data	    bss	    dec	    hex	filename
 233102	   8628	   4809	 246539	  3c30b	drivers/net/wireless/mwifiex/built-in.o.new
 243949	   8628	   4809	 257386	  3ed6a	drivers/net/wireless/mwifiex/built-in.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 07fe2e38

drivers/net/wireless/mwifiex/main.c

+20 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,26 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem) 
}

EXPORT_SYMBOL_GPL(mwifiex_remove_card);



void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,

		  const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	if (!adapter->dev || !(adapter->debug_mask & mask))

		return;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	dev_info(adapter->dev, "%pV", &vaf);



	va_end(args);

}

EXPORT_SYMBOL_GPL(_mwifiex_dbg);



/*

 * This function initializes the module.

 *

drivers/net/wireless/mwifiex/main.h

+8 −9
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 


extern const char driver_version[];



struct mwifiex_adapter;

struct mwifiex_private;



enum {

	MWIFIEX_ASYNC_CMD,

	MWIFIEX_SYNC_CMD
@@ -180,12 +183,11 @@ enum MWIFIEX_DEBUG_LEVEL { 
					MWIFIEX_DBG_FATAL | \

					MWIFIEX_DBG_ERROR)



#define mwifiex_dbg(adapter, dbg_mask, fmt, args...)		\

do {								\

	if ((adapter)->debug_mask & MWIFIEX_DBG_##dbg_mask)	\

		if ((adapter)->dev)				\

			dev_info((adapter)->dev, fmt, ## args);	\

} while (0)

__printf(3, 4)

void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,

		  const char *fmt, ...);

#define mwifiex_dbg(adapter, mask, fmt, ...)				\

	_mwifiex_dbg(adapter, MWIFIEX_DBG_##mask, fmt, ##__VA_ARGS__)



#define DEBUG_DUMP_DATA_MAX_LEN		128

#define mwifiex_dbg_dump(adapter, dbg_mask, str, buf, len)	\
@@ -506,9 +508,6 @@ enum mwifiex_iface_work_flags { 
	MWIFIEX_IFACE_WORK_CARD_RESET,

};



struct mwifiex_adapter;

struct mwifiex_private;



struct mwifiex_private {

	struct mwifiex_adapter *adapter;

	u8 bss_type;