Skip to content

Commit

Permalink
Input: convert remaining uses of pr_warning to pr_warn
Browse files Browse the repository at this point in the history
To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/input

Prior to this patch, there were 8 uses of pr_warning and
17 uses of pr_warn in drivers/input

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Joe Perches authored and Dmitry Torokhov committed Mar 18, 2017
1 parent 4c3362f commit fef5f56
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions drivers/input/gameport/gameport.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ static int gameport_queue_event(void *object, struct module *owner,
}

if (!try_module_get(owner)) {
pr_warning("Can't get module reference, dropping event %d\n",
event_type);
pr_warn("Can't get module reference, dropping event %d\n",
event_type);
kfree(event);
retval = -EINVAL;
goto out;
Expand Down
3 changes: 2 additions & 1 deletion drivers/input/joystick/gamecon.c
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,8 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type)

err = gc_n64_init_ff(input_dev, idx);
if (err) {
pr_warning("Failed to initiate rumble for N64 device %d\n", idx);
pr_warn("Failed to initiate rumble for N64 device %d\n",
idx);
goto err_free_dev;
}

Expand Down
3 changes: 2 additions & 1 deletion drivers/input/misc/apanel.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ static int __init apanel_init(void)
if (devno >= APANEL_DEV_MAX)
pr_notice(APANEL ": unknown device %u found\n", devno);
else if (device_chip[devno] != CHIP_NONE)
pr_warning(APANEL ": duplicate entry for devno %u\n", devno);
pr_warn(APANEL ": duplicate entry for devno %u\n",
devno);

else if (method != 1 && method != 2 && method != 4) {
pr_notice(APANEL ": unknown method %u for devno %u\n",
Expand Down
8 changes: 4 additions & 4 deletions drivers/input/misc/xen-kbdfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ static irqreturn_t input_handler(int rq, void *dev_id)
input_report_key(dev, event->key.keycode,
event->key.pressed);
else
pr_warning("unhandled keycode 0x%x\n",
event->key.keycode);
pr_warn("unhandled keycode 0x%x\n",
event->key.keycode);
break;
case XENKBD_TYPE_POS:
input_report_abs(dev, ABS_X, event->pos.abs_x);
Expand Down Expand Up @@ -133,7 +133,7 @@ static int xenkbd_probe(struct xenbus_device *dev,
ret = xenbus_write(XBT_NIL, dev->nodename,
"request-abs-pointer", "1");
if (ret) {
pr_warning("xenkbd: can't request abs-pointer");
pr_warn("xenkbd: can't request abs-pointer\n");
abs = 0;
}
}
Expand Down Expand Up @@ -327,7 +327,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev,
ret = xenbus_write(XBT_NIL, info->xbdev->nodename,
"request-abs-pointer", "1");
if (ret)
pr_warning("xenkbd: can't request abs-pointer");
pr_warn("xenkbd: can't request abs-pointer\n");
}

xenbus_switch_state(dev, XenbusStateConnected);
Expand Down
8 changes: 4 additions & 4 deletions drivers/input/serio/serio.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ static int serio_queue_event(void *object, struct module *owner,
}

if (!try_module_get(owner)) {
pr_warning("Can't get module reference, dropping event %d\n",
event_type);
pr_warn("Can't get module reference, dropping event %d\n",
event_type);
kfree(event);
retval = -EINVAL;
goto out;
Expand Down Expand Up @@ -823,8 +823,8 @@ static void serio_attach_driver(struct serio_driver *drv)

error = driver_attach(&drv->driver);
if (error)
pr_warning("driver_attach() failed for %s with error %d\n",
drv->driver.name, error);
pr_warn("driver_attach() failed for %s with error %d\n",
drv->driver.name, error);
}

int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name)
Expand Down

0 comments on commit fef5f56

Please sign in to comment.