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

Commit 073730d7 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

wireless: Convert wiphy_debug macro to function 



Save a few bytes of text

(allyesconfig)
$ size drivers/net/wireless/built-in.o*
   text	   data	    bss	    dec	    hex	filename
3924568	 100548	 871056	4896172	 4ab5ac	drivers/net/wireless/built-in.o.new
3926520	 100548	 871464	4898532	 4abee4	drivers/net/wireless/built-in.o.old

$ size net/wireless/core.o*
   text	   data	    bss	    dec	    hex	filename
  12843	    216	   3768	  16827	   41bb	net/wireless/core.o.new
  12328	    216	   3656	  16200	   3f48	net/wireless/core.o

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 903c99d8

include/net/cfg80211.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -2442,8 +2442,9 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev, 
	wiphy_printk(KERN_NOTICE, wiphy, format, ##args)

	wiphy_printk(KERN_NOTICE, wiphy, format, ##args)

#define wiphy_info(wiphy, format, args...)			\

#define wiphy_info(wiphy, format, args...)			\

	wiphy_printk(KERN_INFO, wiphy, format, ##args)

	wiphy_printk(KERN_INFO, wiphy, format, ##args)

#define wiphy_debug(wiphy, format, args...)			\



	wiphy_printk(KERN_DEBUG, wiphy, format, ##args)

int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)

	__attribute__ ((format (printf, 2, 3)));





#if defined(DEBUG)

#if defined(DEBUG)

#define wiphy_dbg(wiphy, format, args...)			\

#define wiphy_dbg(wiphy, format, args...)			\

net/wireless/core.c

+49 −0
Original line number Original line Diff line number Diff line
@@ -907,3 +907,52 @@ static void __exit cfg80211_exit(void) 
	destroy_workqueue(cfg80211_wq);

	destroy_workqueue(cfg80211_wq);

}

}

module_exit(cfg80211_exit);

module_exit(cfg80211_exit);



static int ___wiphy_printk(const char *level, const struct wiphy *wiphy,

			   struct va_format *vaf)

{

	if (!wiphy)

		return printk("%s(NULL wiphy *): %pV", level, vaf);



	return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf);

}



int __wiphy_printk(const char *level, const struct wiphy *wiphy,

		   const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	r = ___wiphy_printk(level, wiphy, &vaf);

	va_end(args);



	return r;

}

EXPORT_SYMBOL(__wiphy_printk);



#define define_wiphy_printk_level(func, kern_level)		\

int func(const struct wiphy *wiphy, const char *fmt, ...)	\

{								\

	struct va_format vaf;					\

	va_list args;						\

	int r;							\

								\

	va_start(args, fmt);					\

								\

	vaf.fmt = fmt;						\

	vaf.va = &args;						\

								\

	r = ___wiphy_printk(kern_level, wiphy, &vaf);		\

	va_end(args);						\

								\

	return r;						\

}								\

EXPORT_SYMBOL(func);



define_wiphy_printk_level(wiphy_debug, KERN_DEBUG);