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 6183573f112f3487ac0caf0add169c521115f4b5..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>
@@ -754,7 +756,7 @@ static void lcd_backlight(int on)
        if (lcd_bl_pin == PIN_NONE)
                return;
 
-       /* The backlight is activated by seting the AUTOFEED line to +5V  */
+       /* The backlight is activated by setting the AUTOFEED line to +5V  */
        spin_lock(&pprt_lock);
        bits.bl = on;
        panel_set_bits();
@@ -1837,12 +1839,6 @@ static void panel_process_inputs(void)
        struct list_head *item;
        struct logical_input *input;
 
-#if 0
-       printk(KERN_DEBUG
-              "entering panel_process_inputs with pp=%016Lx & pc=%016Lx\n",
-              phys_prev, phys_curr);
-#endif
-
        keypressed = 0;
        inputs_stable = 1;
        list_for_each(item, &logical_inputs) {
@@ -1987,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);
@@ -2002,10 +1997,6 @@ static struct logical_input *panel_bind_key(char *name, char *press,
        key->rise_time = 1;
        key->fall_time = 1;
 
-#if 0
-       printk(KERN_DEBUG "bind: <%s> : m=%016Lx v=%016Lx\n", name, key->mask,
-              key->value);
-#endif
        strncpy(key->u.kbd.press_str, press, sizeof(key->u.kbd.press_str));
        strncpy(key->u.kbd.repeat_str, repeat, sizeof(key->u.kbd.repeat_str));
        strncpy(key->u.kbd.release_str, release,
@@ -2030,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))
@@ -2110,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;
        }
 
@@ -2122,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;
        }
 
@@ -2165,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;
        }
 
@@ -2278,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;
        }
 
@@ -2291,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;