Commit 6ea754eb authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: Change netdev_<level> logging functions to return void 



No caller or macro uses the return value so make all
the functions return void.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c87b29c

include/linux/netdevice.h

+9 −10
Original line number Diff line number Diff line
@@ -3612,22 +3612,22 @@ static inline const char *netdev_reg_state(const struct net_device *dev) 
}



__printf(3, 4)

int netdev_printk(const char *level, const struct net_device *dev,

void netdev_printk(const char *level, const struct net_device *dev,

		   const char *format, ...);

__printf(2, 3)

int netdev_emerg(const struct net_device *dev, const char *format, ...);

void netdev_emerg(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_alert(const struct net_device *dev, const char *format, ...);

void netdev_alert(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_crit(const struct net_device *dev, const char *format, ...);

void netdev_crit(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_err(const struct net_device *dev, const char *format, ...);

void netdev_err(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_warn(const struct net_device *dev, const char *format, ...);

void netdev_warn(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_notice(const struct net_device *dev, const char *format, ...);

void netdev_notice(const struct net_device *dev, const char *format, ...);

__printf(2, 3)

int netdev_info(const struct net_device *dev, const char *format, ...);

void netdev_info(const struct net_device *dev, const char *format, ...);



#define MODULE_ALIAS_NETDEV(device) \

	MODULE_ALIAS("netdev-" device)
@@ -3645,7 +3645,6 @@ do { \ 
({								\

	if (0)							\

		netdev_printk(KERN_DEBUG, __dev, format, ##args); \

	0;							\

})

#endif

net/core/dev.c

+17 −27
Original line number Diff line number Diff line
@@ -7066,13 +7066,11 @@ const char *netdev_drivername(const struct net_device *dev) 
	return empty;

}



static int __netdev_printk(const char *level, const struct net_device *dev,

static void __netdev_printk(const char *level, const struct net_device *dev,

			    struct va_format *vaf)

{

	int r;



	if (dev && dev->dev.parent) {

		r = dev_printk_emit(level[1] - '0',

		dev_printk_emit(level[1] - '0',

				dev->dev.parent,

				"%s %s %s%s: %pV",

				dev_driver_string(dev->dev.parent),
@@ -7080,39 +7078,33 @@ static int __netdev_printk(const char *level, const struct net_device *dev, 
				netdev_name(dev), netdev_reg_state(dev),

				vaf);

	} else if (dev) {

		r = printk("%s%s%s: %pV", level, netdev_name(dev),

			   netdev_reg_state(dev), vaf);

		printk("%s%s%s: %pV",

		       level, netdev_name(dev), netdev_reg_state(dev), vaf);

	} else {

		r = printk("%s(NULL net_device): %pV", level, vaf);

		printk("%s(NULL net_device): %pV", level, vaf);

	}



	return r;

}



int netdev_printk(const char *level, const struct net_device *dev,

void netdev_printk(const char *level, const struct net_device *dev,

		   const char *format, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, format);



	vaf.fmt = format;

	vaf.va = &args;



	r = __netdev_printk(level, dev, &vaf);

	__netdev_printk(level, dev, &vaf);



	va_end(args);



	return r;

}

EXPORT_SYMBOL(netdev_printk);



#define define_netdev_printk_level(func, level)			\

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

void func(const struct net_device *dev, const char *fmt, ...)	\

{								\

	int r;							\

	struct va_format vaf;					\

	va_list args;						\

								\
@@ -7121,11 +7113,9 @@ int func(const struct net_device *dev, const char *fmt, ...) \ 
	vaf.fmt = fmt;						\

	vaf.va = &args;						\

								\

	r = __netdev_printk(level, dev, &vaf);			\

	__netdev_printk(level, dev, &vaf);			\

								\

	va_end(args);						\

								\

	return r;						\

}								\

EXPORT_SYMBOL(func);