aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/ser-gigaset.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/gigaset/ser-gigaset.c')
-rw-r--r--drivers/isdn/gigaset/ser-gigaset.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index b306a2ff731..ac245e7e96a 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -407,7 +407,7 @@ static int gigaset_initcshw(struct cardstate *cs)
407 int rc; 407 int rc;
408 408
409 if (!(cs->hw.ser = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL))) { 409 if (!(cs->hw.ser = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL))) {
410 err("%s: out of memory!", __func__); 410 pr_err("out of memory\n");
411 return 0; 411 return 0;
412 } 412 }
413 413
@@ -415,7 +415,7 @@ static int gigaset_initcshw(struct cardstate *cs)
415 cs->hw.ser->dev.id = cs->minor_index; 415 cs->hw.ser->dev.id = cs->minor_index;
416 cs->hw.ser->dev.dev.release = gigaset_device_release; 416 cs->hw.ser->dev.dev.release = gigaset_device_release;
417 if ((rc = platform_device_register(&cs->hw.ser->dev)) != 0) { 417 if ((rc = platform_device_register(&cs->hw.ser->dev)) != 0) {
418 err("error %d registering platform device", rc); 418 pr_err("error %d registering platform device\n", rc);
419 kfree(cs->hw.ser); 419 kfree(cs->hw.ser);
420 cs->hw.ser = NULL; 420 cs->hw.ser = NULL;
421 return 0; 421 return 0;
@@ -513,10 +513,10 @@ gigaset_tty_open(struct tty_struct *tty)
513 513
514 gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101"); 514 gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
515 515
516 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n"); 516 pr_info(DRIVER_DESC "\n");
517 517
518 if (!driver) { 518 if (!driver) {
519 err("%s: no driver structure", __func__); 519 pr_err("%s: no driver structure\n", __func__);
520 return -ENODEV; 520 return -ENODEV;
521 } 521 }
522 522
@@ -572,7 +572,7 @@ gigaset_tty_close(struct tty_struct *tty)
572 tty->disc_data = NULL; 572 tty->disc_data = NULL;
573 573
574 if (!cs->hw.ser) 574 if (!cs->hw.ser)
575 err("%s: no hw cardstate", __func__); 575 pr_err("%s: no hw cardstate\n", __func__);
576 else { 576 else {
577 /* wait for running methods to finish */ 577 /* wait for running methods to finish */
578 if (!atomic_dec_and_test(&cs->hw.ser->refcnt)) 578 if (!atomic_dec_and_test(&cs->hw.ser->refcnt))
@@ -772,7 +772,7 @@ static int __init ser_gigaset_init(void)
772 772
773 gig_dbg(DEBUG_INIT, "%s", __func__); 773 gig_dbg(DEBUG_INIT, "%s", __func__);
774 if ((rc = platform_driver_register(&device_driver)) != 0) { 774 if ((rc = platform_driver_register(&device_driver)) != 0) {
775 err("error %d registering platform driver", rc); 775 pr_err("error %d registering platform driver\n", rc);
776 return rc; 776 return rc;
777 } 777 }
778 778
@@ -783,7 +783,7 @@ static int __init ser_gigaset_init(void)
783 goto error; 783 goto error;
784 784
785 if ((rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc)) != 0) { 785 if ((rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc)) != 0) {
786 err("error %d registering line discipline", rc); 786 pr_err("error %d registering line discipline\n", rc);
787 goto error; 787 goto error;
788 } 788 }
789 789
@@ -810,7 +810,7 @@ static void __exit ser_gigaset_exit(void)
810 } 810 }
811 811
812 if ((rc = tty_unregister_ldisc(N_GIGASET_M101)) != 0) 812 if ((rc = tty_unregister_ldisc(N_GIGASET_M101)) != 0)
813 err("error %d unregistering line discipline", rc); 813 pr_err("error %d unregistering line discipline\n", rc);
814 814
815 platform_driver_unregister(&device_driver); 815 platform_driver_unregister(&device_driver);
816} 816}