Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[~andy/linux] / drivers / video / backlight / cr_bllcd.c

diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 22489eb5f3e0beb525c3965df1d1186c1ee914ca..37bae801e23bfa5e9c8085ef6bae47648730ac14 100644 (file)
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -27,6 +27,8 @@
  *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -180,14 +182,13 @@ static int cr_backlight_probe(struct platform_device *pdev)
        lpc_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                        CRVML_DEVICE_LPC, NULL);
        if (!lpc_dev) {
-               printk("INTEL CARILLO RANCH LPC not found.\n");
+               pr_err("INTEL CARILLO RANCH LPC not found.\n");
                return -ENODEV;
        }
 
        pci_read_config_byte(lpc_dev, CRVML_REG_GPIOEN, &dev_en);
        if (!(dev_en & CRVML_GPIOEN_BIT)) {
-               printk(KERN_ERR
-                      "Carillo Ranch GPIO device was not enabled.\n");
+               pr_err("Carillo Ranch GPIO device was not enabled.\n");
                pci_dev_put(lpc_dev);
                return -ENODEV;
        }
@@ -270,7 +271,7 @@ static int __init cr_backlight_init(void)
                return PTR_ERR(crp);
        }
 
-       printk("Carillo Ranch Backlight Driver Initialized.\n");
+       pr_info("Carillo Ranch Backlight Driver Initialized.\n");
 
        return 0;
 }