batman-adv: Use __func__ to add function names to messages

Message ID 20170308114359.26916-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 9f363d7edd25ae73fa7dc5fef30db71a55c27c32
Delegated to: Simon Wunderlich
Headers

Commit Message

Sven Eckelmann March 8, 2017, 11:43 a.m. UTC
  The name of the function might change in which these messages are printed.
It is therefore better to let the compiler handle the insertion of the
correct function name.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 net/batman-adv/tp_meter.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
  

Comments

Sven Eckelmann March 8, 2017, 11:44 a.m. UTC | #1
Hi,

this should mute following warning from checkpatch.pl:

    WARNING: Prefer using "%s", __func__ to embedded function names
    #876: FILE: ./net/batman-adv/tp_meter.c:876:
    +                              "Meter: batadv_tp_send() cannot send packets (%d)\n",
    
    total: 0 errors, 1 warnings, 0 checks, 1502 lines checked

Kind regards,
	Sven
  
Sven Eckelmann March 17, 2017, 11:55 a.m. UTC | #2
On Mittwoch, 8. März 2017 12:43:59 CET Sven Eckelmann wrote:
> The name of the function might change in which these messages are printed.
> It is therefore better to let the compiler handle the insertion of the
> correct function name.
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
>  net/batman-adv/tp_meter.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Applied in 9f363d7edd25ae73fa7dc5fef30db71a55c27c32 [1].

Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/9f363d7edd25ae73fa7dc5fef30db71a55c27c32
  

Patch

diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index c94ebde..556f9a8 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -873,8 +873,8 @@  static int batadv_tp_send(void *arg)
 		/* something went wrong during the preparation/transmission */
 		if (unlikely(err && err != BATADV_TP_REASON_CANT_SEND)) {
 			batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
-				   "Meter: batadv_tp_send() cannot send packets (%d)\n",
-				   err);
+				   "Meter: %s() cannot send packets (%d)\n",
+				   __func__, err);
 			/* ensure nobody else tries to stop the thread now */
 			if (atomic_dec_and_test(&tp_vars->sending))
 				tp_vars->reason = err;
@@ -979,7 +979,8 @@  void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst,
 	if (!tp_vars) {
 		spin_unlock_bh(&bat_priv->tp_list_lock);
 		batadv_dbg(BATADV_DBG_TP_METER, bat_priv,
-			   "Meter: batadv_tp_start cannot allocate list elements\n");
+			   "Meter: %s cannot allocate list elements\n",
+			   __func__);
 		batadv_tp_batctl_error_notify(BATADV_TP_REASON_MEMORY_ERROR,
 					      dst, bat_priv, session_cookie);
 		return;