Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / staging / panel / panel.c

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index c625567d9ebc9e57694c2e6130786666db6fe564..39f9982c2708ccd3ca1e36bdfd13a53ef92fa51f 100644 (file)
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -34,6 +34,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 
 #include <linux/types.h>
@@ -1981,10 +1983,9 @@ static struct logical_input *panel_bind_key(char *name, char *press,
        struct logical_input *key;
 
        key = kzalloc(sizeof(struct logical_input), GFP_KERNEL);
-       if (!key) {
-               printk(KERN_ERR "panel: not enough memory\n");
+       if (!key)
                return NULL;
-       }
+
        if (!input_name2mask(name, &key->mask, &key->value, &scan_mask_i,
                             &scan_mask_o)) {
                kfree(key);
@@ -2020,10 +2021,9 @@ static struct logical_input *panel_bind_callback(char *name,
        struct logical_input *callback;
 
        callback = kmalloc(sizeof(struct logical_input), GFP_KERNEL);
-       if (!callback) {
-               printk(KERN_ERR "panel: not enough memory\n");
+       if (!callback)
                return NULL;
-       }
+
        memset(callback, 0, sizeof(struct logical_input));
        if (!input_name2mask(name, &callback->mask, &callback->value,
                             &scan_mask_i, &scan_mask_o))
@@ -2100,10 +2100,8 @@ static void panel_attach(struct parport *port)
                return;
 
        if (pprt) {
-               printk(KERN_ERR
-                      "panel_attach(): port->number=%d parport=%d, "
-                      "already registered !\n",
-                      port->number, parport);
+               pr_err("%s: port->number=%d parport=%d, already registered!\n",
+                      __func__, port->number, parport);
                return;
        }
 
@@ -2112,16 +2110,14 @@ static void panel_attach(struct parport *port)
                                       /*PARPORT_DEV_EXCL */
                                       0, (void *)&pprt);
        if (pprt == NULL) {
-               pr_err("panel_attach(): port->number=%d parport=%d, "
-                      "parport_register_device() failed\n",
-                      port->number, parport);
+               pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n",
+                      __func__, port->number, parport);
                return;
        }
 
        if (parport_claim(pprt)) {
-               printk(KERN_ERR
-                      "Panel: could not claim access to parport%d. "
-                      "Aborting.\n", parport);
+               pr_err("could not claim access to parport%d. Aborting.\n",
+                      parport);
                goto err_unreg_device;
        }
 
@@ -2155,10 +2151,8 @@ static void panel_detach(struct parport *port)
                return;
 
        if (!pprt) {
-               printk(KERN_ERR
-                      "panel_detach(): port->number=%d parport=%d, "
-                      "nothing to unregister.\n",
-                      port->number, parport);
+               pr_err("%s: port->number=%d parport=%d, nothing to unregister.\n",
+                      __func__, port->number, parport);
                return;
        }
 
@@ -2268,8 +2262,7 @@ int panel_init(void)
        init_in_progress = 1;
 
        if (parport_register_driver(&panel_driver)) {
-               printk(KERN_ERR
-                      "Panel: could not register with parport. Aborting.\n");
+               pr_err("could not register with parport. Aborting.\n");
                return -EIO;
        }
 
@@ -2281,20 +2274,19 @@ int panel_init(void)
                        pprt = NULL;
                }
                parport_unregister_driver(&panel_driver);
-               printk(KERN_ERR "Panel driver version " PANEL_VERSION
-                      " disabled.\n");
+               pr_err("driver version " PANEL_VERSION " disabled.\n");
                return -ENODEV;
        }
 
        register_reboot_notifier(&panel_notifier);
 
        if (pprt)
-               printk(KERN_INFO "Panel driver version " PANEL_VERSION
-                      " registered on parport%d (io=0x%lx).\n", parport,
-                      pprt->port->base);
+               pr_info("driver version " PANEL_VERSION
+                       " registered on parport%d (io=0x%lx).\n", parport,
+                       pprt->port->base);
        else
-               printk(KERN_INFO "Panel driver version " PANEL_VERSION
-                      " not yet registered\n");
+               pr_info("driver version " PANEL_VERSION
+                       " not yet registered\n");
        /* tells various subsystems about the fact that initialization
           is finished */
        init_in_progress = 0;