aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/hostess_sv11.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wan/hostess_sv11.c')
-rw-r--r--drivers/net/wan/hostess_sv11.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index e817583e6ec5..3d80e4267de8 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -20,6 +20,8 @@
20 * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl> 20 * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
21 */ 21 */
22 22
23#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
24
23#include <linux/module.h> 25#include <linux/module.h>
24#include <linux/kernel.h> 26#include <linux/kernel.h>
25#include <linux/mm.h> 27#include <linux/mm.h>
@@ -192,8 +194,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
192 */ 194 */
193 195
194 if (!request_region(iobase, 8, "Comtrol SV11")) { 196 if (!request_region(iobase, 8, "Comtrol SV11")) {
195 printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n", 197 pr_warn("I/O 0x%X already in use\n", iobase);
196 iobase);
197 return NULL; 198 return NULL;
198 } 199 }
199 200
@@ -221,7 +222,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
221 222
222 if (request_irq(irq, z8530_interrupt, IRQF_DISABLED, 223 if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
223 "Hostess SV11", sv) < 0) { 224 "Hostess SV11", sv) < 0) {
224 printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq); 225 pr_warn("IRQ %d already in use\n", irq);
225 goto err_irq; 226 goto err_irq;
226 } 227 }
227 228
@@ -255,7 +256,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
255 */ 256 */
256 257
257 if (z8530_init(sv)) { 258 if (z8530_init(sv)) {
258 printk(KERN_ERR "Z8530 series device not found.\n"); 259 pr_err("Z8530 series device not found\n");
259 enable_irq(irq); 260 enable_irq(irq);
260 goto free_dma; 261 goto free_dma;
261 } 262 }
@@ -282,7 +283,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
282 netdev->irq = irq; 283 netdev->irq = irq;
283 284
284 if (register_hdlc_device(netdev)) { 285 if (register_hdlc_device(netdev)) {
285 printk(KERN_ERR "hostess: unable to register HDLC device.\n"); 286 pr_err("unable to register HDLC device\n");
286 free_netdev(netdev); 287 free_netdev(netdev);
287 goto free_dma; 288 goto free_dma;
288 } 289 }