staging/olpc_dcon: fix checkpatch warnings

The below checkpatch warnings was fixed,

-  WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
-  WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ...
-  WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
-  WARNING: Prefer pr_err(... to printk(KERN_ERR, ...

And added pr_fmt.

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 37 insertions, 37 deletions

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 2c4bd746715a..d49c32a95690 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -11,6 +11,7 @@
  * License as published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/fb.h>
@@ -72,18 +73,16 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
 
         ver = dcon_read(dcon, DCON_REG_ID);
         if ((ver >> 8) != 0xDC) {
-                printk(KERN_ERR "olpc-dcon:  DCON ID not 0xDCxx: 0x%04x instead.\n",
-                        ver);
+                pr_err("DCON ID not 0xDCxx: 0x%04x instead.\n", ver);
                 rc = -ENXIO;
                 goto err;
         }
 
         if (is_init) {
-                printk(KERN_INFO "olpc-dcon:  Discovered DCON version %x\n",
-                                ver & 0xFF);
+                pr_info("Discovered DCON version %x\n", ver & 0xFF);
                 rc = pdata->init(dcon);
                 if (rc != 0) {
-                        printk(KERN_ERR "olpc-dcon:  Unable to init.\n");
+                        pr_err("Unable to init.\n");
                         goto err;
                 }
         }
@@ -137,8 +136,7 @@ power_up:
                 x = 1;
                 x = olpc_ec_cmd(0x26, (unsigned char *)&x, 1, NULL, 0);
                 if (x) {
-                        printk(KERN_WARNING "olpc-dcon:  unable to force dcon to power up: %d!\n",
-                                x);
+                        pr_warn("unable to force dcon to power up: %d!\n", x);
                         return x;
                 }
                 msleep(10); /* we'll be conservative */
@@ -151,7 +149,7 @@ power_up:
                 x = dcon_read(dcon, DCON_REG_ID);
         }
         if (x < 0) {
-                printk(KERN_ERR "olpc-dcon:  unable to stabilize dcon's smbus, reasserting power and praying.\n");
+                pr_err("unable to stabilize dcon's smbus, reasserting power and praying.\n");
                 BUG_ON(olpc_board_at_least(olpc_board(0xc2)));
                 x = 0;
                 olpc_ec_cmd(0x26, (unsigned char *)&x, 1, NULL, 0);
@@ -222,8 +220,7 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep)
                 x = 0;
                 x = olpc_ec_cmd(0x26, (unsigned char *)&x, 1, NULL, 0);
                 if (x)
-                        printk(KERN_WARNING "olpc-dcon:  unable to force dcon to power down: %d!\n",
-                                x);
+                        pr_warn("unable to force dcon to power down: %d!\n", x);
                 else
                         dcon->asleep = sleep;
         } else {
@@ -232,8 +229,7 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep)
                         dcon->disp_mode |= MODE_BL_ENABLE;
                 x = dcon_bus_stabilize(dcon, 1);
                 if (x)
-                        printk(KERN_WARNING "olpc-dcon:  unable to reinit dcon hardware: %d!\n",
-                                x);
+                        pr_warn("unable to reinit dcon hardware: %d!\n", x);
                 else
                         dcon->asleep = sleep;
 
@@ -304,12 +300,11 @@ static void dcon_source_switch(struct work_struct *work)
 
         switch (source) {
         case DCON_SOURCE_CPU:
-                printk(KERN_INFO "dcon_source_switch to CPU\n");
+                pr_info("dcon_source_switch to CPU\n");
                 /* Enable the scanline interrupt bit */
                 if (dcon_write(dcon, DCON_REG_MODE,
                                 dcon->disp_mode | MODE_SCAN_INT))
-                        printk(KERN_ERR
-                               "olpc-dcon:  couldn't enable scanline interrupt!\n");
+                        pr_err("couldn't enable scanline interrupt!\n");
                 else {
                         /* Wait up to one second for the scanline interrupt */
                         wait_event_timeout(dcon_wait_queue,
@@ -317,11 +312,11 @@ static void dcon_source_switch(struct work_struct *work)
                 }
 
                 if (!dcon->switched)
-                        printk(KERN_ERR "olpc-dcon:  Timeout entering CPU mode; expect a screen glitch.\n");
+                        pr_err("Timeout entering CPU mode; expect a screen glitch.\n");
 
                 /* Turn off the scanline interrupt */
                 if (dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode))
-                        printk(KERN_ERR "olpc-dcon:  couldn't disable scanline interrupt!\n");
+                        pr_err("couldn't disable scanline interrupt!\n");
 
                 /*
                  * Ideally we'd like to disable interrupts here so that the
@@ -332,7 +327,7 @@ static void dcon_source_switch(struct work_struct *work)
                  * For now, we just hope..
                  */
                 if (!dcon_blank_fb(dcon, false)) {
-                        printk(KERN_ERR "olpc-dcon:  Failed to enter CPU mode\n");
+                        pr_err("Failed to enter CPU mode\n");
                         dcon->pending_src = DCON_SOURCE_DCON;
                         return;
                 }
@@ -341,14 +336,14 @@ static void dcon_source_switch(struct work_struct *work)
                 pdata->set_dconload(1);
                 getnstimeofday(&dcon->load_time);
 
-                printk(KERN_INFO "olpc-dcon: The CPU has control\n");
+                pr_info("The CPU has control\n");
                 break;
         case DCON_SOURCE_DCON:
         {
                 int t;
                 struct timespec delta_t;
 
-                printk(KERN_INFO "dcon_source_switch to DCON\n");
+                pr_info("dcon_source_switch to DCON\n");
 
                 add_wait_queue(&dcon_wait_queue, &wait);
                 set_current_state(TASK_UNINTERRUPTIBLE);
@@ -362,7 +357,7 @@ static void dcon_source_switch(struct work_struct *work)
                 set_current_state(TASK_RUNNING);
 
                 if (!dcon->switched) {
-                        printk(KERN_ERR "olpc-dcon: Timeout entering DCON mode; expect a screen glitch.\n");
+                        pr_err("Timeout entering DCON mode; expect a screen glitch.\n");
                 } else {
                         /* sometimes the DCON doesn't follow its own rules,
                          * and doesn't wait for two vsync pulses before
@@ -378,7 +373,7 @@ static void dcon_source_switch(struct work_struct *work)
                         delta_t = timespec_sub(dcon->irq_time, dcon->load_time);
                         if (dcon->switched && delta_t.tv_sec == 0 &&
                                         delta_t.tv_nsec < NSEC_PER_MSEC * 20) {
-                                printk(KERN_ERR "olpc-dcon: missed loading, retrying\n");
+                                pr_err("missed loading, retrying\n");
                                 pdata->set_dconload(1);
                                 mdelay(41);
                                 pdata->set_dconload(0);
@@ -388,7 +383,7 @@ static void dcon_source_switch(struct work_struct *work)
                 }
 
                 dcon_blank_fb(dcon, true);
-                printk(KERN_INFO "olpc-dcon: The DCON has control\n");
+                pr_info("The DCON has control\n");
                 break;
         }
         default:
@@ -476,7 +471,7 @@ static ssize_t dcon_freeze_store(struct device *dev,
         if (ret)
                 return ret;
 
-        printk(KERN_INFO "dcon_freeze_store: %lu\n", output);
+        pr_info("dcon_freeze_store: %lu\n", output);
 
         switch (output) {
         case 0:
@@ -650,7 +645,7 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
         dcon_device = platform_device_alloc("dcon", -1);
 
         if (dcon_device == NULL) {
-                printk(KERN_ERR "dcon:  Unable to create the DCON device\n");
+                pr_err("Unable to create the DCON device\n");
                 rc = -ENOMEM;
                 goto eirq;
         }
@@ -658,7 +653,7 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
         platform_set_drvdata(dcon_device, dcon);
 
         if (rc) {
-                printk(KERN_ERR "dcon:  Unable to add the DCON device\n");
+                pr_err("Unable to add the DCON device\n");
                 goto edev;
         }
 
@@ -762,7 +757,7 @@ irqreturn_t dcon_interrupt(int irq, void *id)
 
         switch (status & 3) {
         case 3:
-                printk(KERN_DEBUG "olpc-dcon: DCONLOAD_MISSED interrupt\n");
+                pr_debug("DCONLOAD_MISSED interrupt\n");
                 break;
 
         case 2: /* switch to DCON mode */
@@ -784,9 +779,9 @@ irqreturn_t dcon_interrupt(int irq, void *id)
                         dcon->switched = true;
                         getnstimeofday(&dcon->irq_time);
                         wake_up(&dcon_wait_queue);
-                        printk(KERN_DEBUG "olpc-dcon: switching w/ status 0/0\n");
+                        pr_debug("switching w/ status 0/0\n");
                 } else {
-                        printk(KERN_DEBUG "olpc-dcon: scanline interrupt w/CPU\n");
+                        pr_debug("scanline interrupt w/CPU\n");
                 }
         }
 
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index c87fdfac4855..77e8eb5a5abd 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -10,6 +10,9 @@
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/cs5535.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
@@ -22,23 +25,23 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
         unsigned char lob;
 
         if (gpio_request(OLPC_GPIO_DCON_STAT0, "OLPC-DCON")) {
-                printk(KERN_ERR "olpc-dcon: failed to request STAT0 GPIO\n");
+                pr_err("failed to request STAT0 GPIO\n");
                 return -EIO;
         }
         if (gpio_request(OLPC_GPIO_DCON_STAT1, "OLPC-DCON")) {
-                printk(KERN_ERR "olpc-dcon: failed to request STAT1 GPIO\n");
+                pr_err("failed to request STAT1 GPIO\n");
                 goto err_gp_stat1;
         }
         if (gpio_request(OLPC_GPIO_DCON_IRQ, "OLPC-DCON")) {
-                printk(KERN_ERR "olpc-dcon: failed to request IRQ GPIO\n");
+                pr_err("failed to request IRQ GPIO\n");
                 goto err_gp_irq;
         }
         if (gpio_request(OLPC_GPIO_DCON_LOAD, "OLPC-DCON")) {
-                printk(KERN_ERR "olpc-dcon: failed to request LOAD GPIO\n");
+                pr_err("failed to request LOAD GPIO\n");
                 goto err_gp_load;
         }
         if (gpio_request(OLPC_GPIO_DCON_BLANK, "OLPC-DCON")) {
-                printk(KERN_ERR "olpc-dcon: failed to request BLANK GPIO\n");
+                pr_err("failed to request BLANK GPIO\n");
                 goto err_gp_blank;
         }
 
@@ -83,7 +86,7 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
 
         /* Register the interrupt handler */
         if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
-                printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n");
+                pr_err("failed to request DCON's irq\n");
                 goto err_req_irq;
         }
 
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
index 69415eec425c..352dd3db0132 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
@@ -6,6 +6,8 @@
  * License as published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
@@ -66,7 +68,7 @@ static int dcon_init_xo_1_5(struct dcon_priv *dcon)
         pdev = pci_get_device(PCI_VENDOR_ID_VIA,
                               PCI_DEVICE_ID_VIA_VX855, NULL);
         if (!pdev) {
-                printk(KERN_ERR "cannot find VX855 PCI ID\n");
+                pr_err("cannot find VX855 PCI ID\n");
                 return 1;
         }
 
@@ -104,7 +106,7 @@ static int dcon_init_xo_1_5(struct dcon_priv *dcon)
         /* we're sharing the IRQ with ACPI */
         irq = acpi_gbl_FADT.sci_interrupt;
         if (request_irq(irq, &dcon_interrupt, IRQF_SHARED, "DCON", dcon)) {
-                printk(KERN_ERR PREFIX "DCON (IRQ%d) allocation failed\n", irq);
+                pr_err("DCON (IRQ%d) allocation failed\n", irq);
                 return 1;
         }