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

Commit 020f01eb authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/isdn/mISDN: Use printf extension %pV 



Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.

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

drivers/isdn/mISDN/layer1.c

+7 −3
Original line number Diff line number Diff line
@@ -99,12 +99,16 @@ static void 
l1m_debug(struct FsmInst *fi, char *fmt, ...)

{

	struct layer1 *l1 = fi->userdata;

	struct va_format vaf;

	va_list va;



	va_start(va, fmt);

	printk(KERN_DEBUG "%s: ", dev_name(&l1->dch->dev.dev));

	vprintk(fmt, va);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &va;



	printk(KERN_DEBUG "%s: %pV\n", dev_name(&l1->dch->dev.dev), &vaf);



	va_end(va);

}

drivers/isdn/mISDN/layer2.c

+9 −3
Original line number Diff line number Diff line
@@ -95,14 +95,20 @@ static void 
l2m_debug(struct FsmInst *fi, char *fmt, ...)

{

	struct layer2 *l2 = fi->userdata;

	struct va_format vaf;

	va_list va;



	if (!(*debug & DEBUG_L2_FSM))

		return;



	va_start(va, fmt);

	printk(KERN_DEBUG "l2 (sapi %d tei %d): ", l2->sapi, l2->tei);

	vprintk(fmt, va);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &va;



	printk(KERN_DEBUG "l2 (sapi %d tei %d): %pV\n",

	       l2->sapi, l2->tei, &vaf);



	va_end(va);

}

drivers/isdn/mISDN/tei.c

+17 −6
Original line number Diff line number Diff line
@@ -79,14 +79,19 @@ static void 
da_debug(struct FsmInst *fi, char *fmt, ...)

{

	struct manager	*mgr = fi->userdata;

	struct va_format vaf;

	va_list va;



	if (!(*debug & DEBUG_L2_TEIFSM))

		return;



	va_start(va, fmt);

	printk(KERN_DEBUG "mgr(%d): ", mgr->ch.st->dev->id);

	vprintk(fmt, va);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &va;



	printk(KERN_DEBUG "mgr(%d): %pV\n", mgr->ch.st->dev->id, &vaf);



	va_end(va);

}
@@ -223,14 +228,20 @@ static void 
tei_debug(struct FsmInst *fi, char *fmt, ...)

{

	struct teimgr	*tm = fi->userdata;

	struct va_format vaf;

	va_list va;



	if (!(*debug & DEBUG_L2_TEIFSM))

		return;



	va_start(va, fmt);

	printk(KERN_DEBUG "sapi(%d) tei(%d): ", tm->l2->sapi, tm->l2->tei);

	vprintk(fmt, va);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &va;



	printk(KERN_DEBUG "sapi(%d) tei(%d): %pV\n",

	       tm->l2->sapi, tm->l2->tei, &vaf);



	va_end(va);

}