gigaset: use pr_err() and pr_info()

Switch from private printk wrapper macros to using pr_err() and
pr_info() from linux/kernel.h, at the same time unifying a few
error messages.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3eca9c8067f6..18dd8aacbe8d 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2067,7 +2067,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
 
         bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
         if (!ubc) {
-                err("could not allocate bas_bc_state");
+                pr_err("out of memory\n");
                 return 0;
         }
 
@@ -2081,7 +2081,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
         ubc->isooutdone = ubc->isooutfree = ubc->isooutovfl = NULL;
         ubc->numsub = 0;
         if (!(ubc->isooutbuf = kmalloc(sizeof(struct isowbuf_t), GFP_KERNEL))) {
-                err("could not allocate isochronous output buffer");
+                pr_err("out of memory\n");
                 kfree(ubc);
                 bcs->hw.bas = NULL;
                 return 0;
@@ -2136,8 +2136,10 @@ static int gigaset_initcshw(struct cardstate *cs)
         struct bas_cardstate *ucs;
 
         cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
-        if (!ucs)
+        if (!ucs) {
+                pr_err("out of memory\n");
                 return 0;
+        }
 
         ucs->urb_cmd_in = NULL;
         ucs->urb_cmd_out = NULL;
@@ -2503,11 +2505,11 @@ static int __init bas_gigaset_init(void)
         /* register this driver with the USB subsystem */
         result = usb_register(&gigaset_usb_driver);
         if (result < 0) {
-                err("usb_register failed (error %d)", -result);
+                pr_err("error %d registering USB driver\n", -result);
                 goto error;
         }
 
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
+        pr_info(DRIVER_DESC "\n");
         return 0;
 
 error: