Input: convert remaining uses of pr_warning to pr_warn

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>

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 4a2a9e370be74a20d51fd651f86e497ddac94157..092cc4188b57a6c5363475e5195e6febbedbf692 100644 (file)
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -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;

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index eae14d512353aae4902f3ce482c1cf87cba736b6..c43f087a496d4864fe45d9b60c4386fd9763c6fa 100644 (file)
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -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;
                }
 

diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index 53630afab6061d5833f5bf85f72c07e1d59bb39e..aad1df04c85476f93014532e8f8778b34245ca8a 100644 (file)
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -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",

diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index 3900875dec1051aa494fcfe4879fe685885111a8..1fd911d4fadf2defb261f15d49a205cf69368bb1 100644 (file)
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -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);
@@ -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;
                }
        }
@@ -327,7 +327,7 @@ InitWait:
                        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);

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 1ca7f551e2dabe73896f780ec53e4c6735d13019..048ae748c4d1f22c19a392dec949f715dc3b525a 100644 (file)
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -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;
@@ -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)