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

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

ath: change logging functions to return void 



The return values are not used by callers of these functions
so change the functions to return void.

Other miscellanea:

o add __printf verification to wil6210 logging functions
  No format/argument mismatches found

Acked-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 7869b4fa

drivers/net/wireless/ath/ath10k/debug.c

+5 −13
Original line number Diff line number Diff line
@@ -107,21 +107,18 @@ struct ath10k_dump_file_data { 
	u8 data[0];

} __packed;



int ath10k_info(struct ath10k *ar, const char *fmt, ...)

void ath10k_info(struct ath10k *ar, const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;

	int ret;



	va_start(args, fmt);

	vaf.va = &args;

	ret = dev_info(ar->dev, "%pV", &vaf);

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

	trace_ath10k_log_info(ar, &vaf);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL(ath10k_info);
@@ -148,25 +145,22 @@ void ath10k_print_driver_info(struct ath10k *ar) 
}

EXPORT_SYMBOL(ath10k_print_driver_info);



int ath10k_err(struct ath10k *ar, const char *fmt, ...)

void ath10k_err(struct ath10k *ar, const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;

	int ret;



	va_start(args, fmt);

	vaf.va = &args;

	ret = dev_err(ar->dev, "%pV", &vaf);

	dev_err(ar->dev, "%pV", &vaf);

	trace_ath10k_log_err(ar, &vaf);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL(ath10k_err);



int ath10k_warn(struct ath10k *ar, const char *fmt, ...)

void ath10k_warn(struct ath10k *ar, const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,
@@ -179,8 +173,6 @@ int ath10k_warn(struct ath10k *ar, const char *fmt, ...) 
	trace_ath10k_log_warn(ar, &vaf);



	va_end(args);



	return 0;

}

EXPORT_SYMBOL(ath10k_warn);

drivers/net/wireless/ath/ath10k/debug.h

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ enum ath10k_debug_mask { 


extern unsigned int ath10k_debug_mask;



__printf(2, 3) int ath10k_info(struct ath10k *ar, const char *fmt, ...);

__printf(2, 3) int ath10k_err(struct ath10k *ar, const char *fmt, ...);

__printf(2, 3) int ath10k_warn(struct ath10k *ar, const char *fmt, ...);

__printf(2, 3) void ath10k_info(struct ath10k *ar, const char *fmt, ...);

__printf(2, 3) void ath10k_err(struct ath10k *ar, const char *fmt, ...);

__printf(2, 3) void ath10k_warn(struct ath10k *ar, const char *fmt, ...);

void ath10k_print_driver_info(struct ath10k *ar);



#ifdef CONFIG_ATH10K_DEBUGFS

drivers/net/wireless/ath/ath6kl/common.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#define ATH6KL_MAX_IE			256



__printf(2, 3) int ath6kl_printk(const char *level, const char *fmt, ...);

__printf(2, 3) void ath6kl_printk(const char *level, const char *fmt, ...);



/*

 * Reflects the version of binary interface exposed by ATH6KL target

drivers/net/wireless/ath/ath6kl/debug.c

+8 −20
Original line number Diff line number Diff line
@@ -37,76 +37,64 @@ struct ath6kl_fwlog_slot { 


#define ATH6KL_FWLOG_VALID_MASK 0x1ffff



int ath6kl_printk(const char *level, const char *fmt, ...)

void ath6kl_printk(const char *level, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int rtn;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	rtn = printk("%sath6kl: %pV", level, &vaf);

	printk("%sath6kl: %pV", level, &vaf);



	va_end(args);



	return rtn;

}

EXPORT_SYMBOL(ath6kl_printk);



int ath6kl_info(const char *fmt, ...)

void ath6kl_info(const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;

	int ret;



	va_start(args, fmt);

	vaf.va = &args;

	ret = ath6kl_printk(KERN_INFO, "%pV", &vaf);

	ath6kl_printk(KERN_INFO, "%pV", &vaf);

	trace_ath6kl_log_info(&vaf);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL(ath6kl_info);



int ath6kl_err(const char *fmt, ...)

void ath6kl_err(const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;

	int ret;



	va_start(args, fmt);

	vaf.va = &args;

	ret = ath6kl_printk(KERN_ERR, "%pV", &vaf);

	ath6kl_printk(KERN_ERR, "%pV", &vaf);

	trace_ath6kl_log_err(&vaf);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL(ath6kl_err);



int ath6kl_warn(const char *fmt, ...)

void ath6kl_warn(const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;

	int ret;



	va_start(args, fmt);

	vaf.va = &args;

	ret = ath6kl_printk(KERN_WARNING, "%pV", &vaf);

	ath6kl_printk(KERN_WARNING, "%pV", &vaf);

	trace_ath6kl_log_warn(&vaf);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL(ath6kl_warn);

drivers/net/wireless/ath/ath6kl/debug.h

+6 −7
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ enum ATH6K_DEBUG_MASK { 
};



extern unsigned int debug_mask;

__printf(2, 3) int ath6kl_printk(const char *level, const char *fmt, ...);

__printf(1, 2) int ath6kl_info(const char *fmt, ...);

__printf(1, 2) int ath6kl_err(const char *fmt, ...);

__printf(1, 2) int ath6kl_warn(const char *fmt, ...);

__printf(2, 3) void ath6kl_printk(const char *level, const char *fmt, ...);

__printf(1, 2) void ath6kl_info(const char *fmt, ...);

__printf(1, 2) void ath6kl_err(const char *fmt, ...);

__printf(1, 2) void ath6kl_warn(const char *fmt, ...);



enum ath6kl_war {

	ATH6KL_WAR_INVALID_RATE,
@@ -81,10 +81,9 @@ int ath6kl_debug_init_fs(struct ath6kl *ar); 
void ath6kl_debug_cleanup(struct ath6kl *ar);



#else

static inline int ath6kl_dbg(enum ATH6K_DEBUG_MASK dbg_mask,

static inline void ath6kl_dbg(enum ATH6K_DEBUG_MASK dbg_mask,

			      const char *fmt, ...)

{

	return 0;

}



static inline void ath6kl_dbg_dump(enum ATH6K_DEBUG_MASK mask,