aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/irtty-sir.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-11-11 16:37:30 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-11 18:11:00 -0500
commit6c91023dc35c88d5e6aebe4bfe6f1ed5ec2b84be (patch)
tree2f33e40962dd622ae926ff7e8284f3ef540d3ca9 /drivers/net/irda/irtty-sir.c
parent09626e9d153326ca82568e4e27f2daa53713992e (diff)
irda: Remove IRDA_<TYPE> logging macros
And use the more common mechanisms directly. Other miscellanea: o Coalesce formats o Add missing newlines o Realign arguments o Remove unnecessary OOM message logging as there's a generic stack dump already on OOM. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/irtty-sir.c')
-rw-r--r--drivers/net/irda/irtty-sir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 24b6dddd7f2f..abbb654c0666 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -231,7 +231,7 @@ static void irtty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
231 231
232 dev = priv->dev; 232 dev = priv->dev;
233 if (!dev) { 233 if (!dev) {
234 IRDA_WARNING("%s(), not ready yet!\n", __func__); 234 net_warn_ratelimited("%s(), not ready yet!\n", __func__);
235 return; 235 return;
236 } 236 }
237 237
@@ -555,8 +555,8 @@ static int __init irtty_sir_init(void)
555 int err; 555 int err;
556 556
557 if ((err = tty_register_ldisc(N_IRDA, &irda_ldisc)) != 0) 557 if ((err = tty_register_ldisc(N_IRDA, &irda_ldisc)) != 0)
558 IRDA_ERROR("IrDA: can't register line discipline (err = %d)\n", 558 net_err_ratelimited("IrDA: can't register line discipline (err = %d)\n",
559 err); 559 err);
560 return err; 560 return err;
561} 561}
562 562
@@ -565,8 +565,8 @@ static void __exit irtty_sir_cleanup(void)
565 int err; 565 int err;
566 566
567 if ((err = tty_unregister_ldisc(N_IRDA))) { 567 if ((err = tty_unregister_ldisc(N_IRDA))) {
568 IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n", 568 net_err_ratelimited("%s(), can't unregister line discipline (err = %d)\n",
569 __func__, err); 569 __func__, err);
570 } 570 }
571} 571}
572 572