diff options
Diffstat (limited to 'drivers/input/serio/serio_raw.c')
-rw-r--r-- | drivers/input/serio/serio_raw.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index a5afc7cbcdfc..396a17fcc344 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
@@ -279,7 +279,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv) | |||
279 | int err; | 279 | int err; |
280 | 280 | ||
281 | if (!(serio_raw = kzalloc(sizeof(struct serio_raw), GFP_KERNEL))) { | 281 | if (!(serio_raw = kzalloc(sizeof(struct serio_raw), GFP_KERNEL))) { |
282 | printk(KERN_ERR "serio_raw.c: can't allocate memory for a device\n"); | 282 | dev_dbg(&serio->dev, "can't allocate memory for a device\n"); |
283 | return -ENOMEM; | 283 | return -ENOMEM; |
284 | } | 284 | } |
285 | 285 | ||
@@ -311,13 +311,14 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv) | |||
311 | } | 311 | } |
312 | 312 | ||
313 | if (err) { | 313 | if (err) { |
314 | printk(KERN_INFO "serio_raw: failed to register raw access device for %s\n", | 314 | dev_err(&serio->dev, |
315 | "failed to register raw access device for %s\n", | ||
315 | serio->phys); | 316 | serio->phys); |
316 | goto out_close; | 317 | goto out_close; |
317 | } | 318 | } |
318 | 319 | ||
319 | printk(KERN_INFO "serio_raw: raw access enabled on %s (%s, minor %d)\n", | 320 | dev_info(&serio->dev, "raw access enabled on %s (%s, minor %d)\n", |
320 | serio->phys, serio_raw->name, serio_raw->dev.minor); | 321 | serio->phys, serio_raw->name, serio_raw->dev.minor); |
321 | goto out; | 322 | goto out; |
322 | 323 | ||
323 | out_close: | 324 | out_close: |
@@ -337,7 +338,8 @@ static int serio_raw_reconnect(struct serio *serio) | |||
337 | struct serio_driver *drv = serio->drv; | 338 | struct serio_driver *drv = serio->drv; |
338 | 339 | ||
339 | if (!drv || !serio_raw) { | 340 | if (!drv || !serio_raw) { |
340 | printk(KERN_DEBUG "serio_raw: reconnect request, but serio is disconnected, ignoring...\n"); | 341 | dev_dbg(&serio->dev, |
342 | "reconnect request, but serio is disconnected, ignoring...\n"); | ||
341 | return -1; | 343 | return -1; |
342 | } | 344 | } |
343 | 345 | ||