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

[linux.git] / drivers / char / toshiba.c

diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 0bdc602f0d48d9d8d61597108ecc6bf18ef42804..98f3150e00483fa3b047d7489c4e240080427c62 100644 (file)
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -373,7 +373,7 @@ static int tosh_get_machine_id(void __iomem *bios)
                   value. This has been verified on a Satellite Pro 430CDT,
                   Tecra 750CDT, Tecra 780DVD and Satellite 310CDT. */
 #if TOSH_DEBUG
-               printk("toshiba: debugging ID ebx=0x%04x\n", regs.ebx);
+               pr_debug("toshiba: debugging ID ebx=0x%04x\n", regs.ebx);
 #endif
                bx = 0xe6f5;
 
@@ -417,7 +417,7 @@ static int tosh_probe(void)
 
        for (i=0;i<7;i++) {
                if (readb(bios+0xe010+i)!=signature[i]) {
-                       printk("toshiba: not a supported Toshiba laptop\n");
+                       pr_err("toshiba: not a supported Toshiba laptop\n");
                        iounmap(bios);
                        return -ENODEV;
                }
@@ -433,7 +433,7 @@ static int tosh_probe(void)
        /* if this is not a Toshiba laptop carry flag is set and ah=0x86 */
 
        if ((flag==1) || ((regs.eax & 0xff00)==0x8600)) {
-               printk("toshiba: not a supported Toshiba laptop\n");
+               pr_err("toshiba: not a supported Toshiba laptop\n");
                iounmap(bios);
                return -ENODEV;
        }
@@ -486,7 +486,7 @@ static int __init toshiba_init(void)
        if (tosh_probe())
                return -ENODEV;
 
-       printk(KERN_INFO "Toshiba System Management Mode driver v" TOSH_VERSION "\n");
+       pr_info("Toshiba System Management Mode driver v" TOSH_VERSION "\n");
 
        /* set the port to use for Fn status if not specified as a parameter */
        if (tosh_fn==0x00)