aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/bas-gigaset.c
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2008-12-26 04:21:29 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-26 04:21:29 -0500
commitc8770dcabd6a615b155c25dc4d57251d3e7f151c (patch)
tree3f8bbf9d4f17525440b22bfb702f35a9f7bdf033 /drivers/isdn/gigaset/bas-gigaset.c
parent4d8cd002602987ddc9507b5390800343f820ac92 (diff)
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>
Diffstat (limited to 'drivers/isdn/gigaset/bas-gigaset.c')
-rw-r--r--drivers/isdn/gigaset/bas-gigaset.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3eca9c8067f..18dd8aacbe8 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)
2067 2067
2068 bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL); 2068 bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
2069 if (!ubc) { 2069 if (!ubc) {
2070 err("could not allocate bas_bc_state"); 2070 pr_err("out of memory\n");
2071 return 0; 2071 return 0;
2072 } 2072 }
2073 2073
@@ -2081,7 +2081,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
2081 ubc->isooutdone = ubc->isooutfree = ubc->isooutovfl = NULL; 2081 ubc->isooutdone = ubc->isooutfree = ubc->isooutovfl = NULL;
2082 ubc->numsub = 0; 2082 ubc->numsub = 0;
2083 if (!(ubc->isooutbuf = kmalloc(sizeof(struct isowbuf_t), GFP_KERNEL))) { 2083 if (!(ubc->isooutbuf = kmalloc(sizeof(struct isowbuf_t), GFP_KERNEL))) {
2084 err("could not allocate isochronous output buffer"); 2084 pr_err("out of memory\n");
2085 kfree(ubc); 2085 kfree(ubc);
2086 bcs->hw.bas = NULL; 2086 bcs->hw.bas = NULL;
2087 return 0; 2087 return 0;
@@ -2136,8 +2136,10 @@ static int gigaset_initcshw(struct cardstate *cs)
2136 struct bas_cardstate *ucs; 2136 struct bas_cardstate *ucs;
2137 2137
2138 cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL); 2138 cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
2139 if (!ucs) 2139 if (!ucs) {
2140 pr_err("out of memory\n");
2140 return 0; 2141 return 0;
2142 }
2141 2143
2142 ucs->urb_cmd_in = NULL; 2144 ucs->urb_cmd_in = NULL;
2143 ucs->urb_cmd_out = NULL; 2145 ucs->urb_cmd_out = NULL;
@@ -2503,11 +2505,11 @@ static int __init bas_gigaset_init(void)
2503 /* register this driver with the USB subsystem */ 2505 /* register this driver with the USB subsystem */
2504 result = usb_register(&gigaset_usb_driver); 2506 result = usb_register(&gigaset_usb_driver);
2505 if (result < 0) { 2507 if (result < 0) {
2506 err("usb_register failed (error %d)", -result); 2508 pr_err("error %d registering USB driver\n", -result);
2507 goto error; 2509 goto error;
2508 } 2510 }
2509 2511
2510 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n"); 2512 pr_info(DRIVER_DESC "\n");
2511 return 0; 2513 return 0;
2512 2514
2513error: 2515error: