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

Commit e5225b39 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: reduce debug output 



This patch tries to make dmesg logs between different runs easier
to compare by

* removing the jiffies (use CONFIG_PRINTK_TIME if you need
  timing)
* remove the line numbers, they change with each applied patch

It also changes the deprecated __FUNCTION__ to __func__ to make
checkpatch.pl happy.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 056cdd59

drivers/net/wireless/libertas/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -1186,8 +1186,8 @@ static void lbs_submit_command(struct lbs_private *priv, 
	    command == CMD_802_11_AUTHENTICATE)

		timeo = 10 * HZ;



	lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d, jiffies %lu\n",

		     command, le16_to_cpu(cmd->seqnum), cmdsize, jiffies);

	lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n",

		     command, le16_to_cpu(cmd->seqnum), cmdsize);

	lbs_deb_hex(LBS_DEB_CMD, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);



	ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);

drivers/net/wireless/libertas/cmdresp.c

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ int lbs_process_rx_command(struct lbs_private *priv) 
	respcmd = le16_to_cpu(resp->command);

	result = le16_to_cpu(resp->result);



	lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",

		     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);

	lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d\n",

		     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len);

	lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len);



	if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {

drivers/net/wireless/libertas/defs.h

+5 −5
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ do { if ((lbs_debug & (grp)) == (grp)) \ 
#endif



#define lbs_deb_enter(grp) \

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s():%d\n", __FUNCTION__, __LINE__);

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s()\n", __func__);

#define lbs_deb_enter_args(grp, fmt, args...) \

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt "):%d\n", __FUNCTION__, ## args, __LINE__);

  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt ")\n", __func__, ## args);

#define lbs_deb_leave(grp) \

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d\n", __FUNCTION__, __LINE__);

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s()\n", __func__);

#define lbs_deb_leave_args(grp, fmt, args...) \

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d, " fmt "\n", \

  __FUNCTION__, __LINE__, ##args);

  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s(), " fmt "\n", \

  __func__, ##args);

#define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)

#define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)

#define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)