vga_switcheroo: Use pr_*() instead of printk()

This silences a bunch of checkpatch warnings and makes the code shorter.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 37ac7b5dbd066025c90009d6b44a1c08fffcc800..0611ea8a5c49c8ce736504ccc81a9937937b46b8 100644 (file)
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -111,7 +111,7 @@ int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler)
 
        vgasr_priv.handler = handler;
        if (vga_switcheroo_ready()) {
-               printk(KERN_INFO "vga_switcheroo: enabled\n");
+               pr_info("vga_switcheroo: enabled\n");
                vga_switcheroo_enable();
        }
        mutex_unlock(&vgasr_mutex);
@@ -155,7 +155,7 @@ static int register_client(struct pci_dev *pdev,
                vgasr_priv.registered_clients++;
 
        if (vga_switcheroo_ready()) {
-               printk(KERN_INFO "vga_switcheroo: enabled\n");
+               pr_info("vga_switcheroo: enabled\n");
                vga_switcheroo_enable();
        }
        mutex_unlock(&vgasr_mutex);
@@ -235,7 +235,7 @@ void vga_switcheroo_unregister_client(struct pci_dev *pdev)
                kfree(client);
        }
        if (vgasr_priv.active && vgasr_priv.registered_clients < 2) {
-               printk(KERN_INFO "vga_switcheroo: disabled\n");
+               pr_info("vga_switcheroo: disabled\n");
                vga_switcheroo_debugfs_fini(&vgasr_priv);
                vgasr_priv.active = false;
        }
@@ -375,7 +375,7 @@ static bool check_can_switch(void)
 
        list_for_each_entry(client, &vgasr_priv.clients, list) {
                if (!client->ops->can_switch(client->pdev)) {
-                       printk(KERN_ERR "vga_switcheroo: client %x refused switch\n", client->id);
+                       pr_err("vga_switcheroo: client %x refused switch\n", client->id);
                        return false;
                }
        }
@@ -484,20 +484,20 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
        if (can_switch) {
                ret = vga_switchto_stage1(client);
                if (ret)
-                       printk(KERN_ERR "vga_switcheroo: switching failed stage 1 %d\n", ret);
+                       pr_err("vga_switcheroo: switching failed stage 1 %d\n", ret);
 
                ret = vga_switchto_stage2(client);
                if (ret)
-                       printk(KERN_ERR "vga_switcheroo: switching failed stage 2 %d\n", ret);
+                       pr_err("vga_switcheroo: switching failed stage 2 %d\n", ret);
 
        } else {
-               printk(KERN_INFO "vga_switcheroo: setting delayed switch to client %d\n", client->id);
+               pr_info("vga_switcheroo: setting delayed switch to client %d\n", client->id);
                vgasr_priv.delayed_switch_active = true;
                vgasr_priv.delayed_client_id = client_id;
 
                ret = vga_switchto_stage1(client);
                if (ret)
-                       printk(KERN_ERR "vga_switcheroo: delayed switching stage 1 failed %d\n", ret);
+                       pr_err("vga_switcheroo: delayed switching stage 1 failed %d\n", ret);
        }
 
 out:
@@ -534,14 +534,14 @@ static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv)
        priv->debugfs_root = debugfs_create_dir("vgaswitcheroo", NULL);
 
        if (!priv->debugfs_root) {
-               printk(KERN_ERR "vga_switcheroo: Cannot create /sys/kernel/debug/vgaswitcheroo\n");
+               pr_err("vga_switcheroo: Cannot create /sys/kernel/debug/vgaswitcheroo\n");
                goto fail;
        }
 
        priv->switch_file = debugfs_create_file("switch", 0644,
                                                priv->debugfs_root, NULL, &vga_switcheroo_debugfs_fops);
        if (!priv->switch_file) {
-               printk(KERN_ERR "vga_switcheroo: cannot create /sys/kernel/debug/vgaswitcheroo/switch\n");
+               pr_err("vga_switcheroo: cannot create /sys/kernel/debug/vgaswitcheroo/switch\n");
                goto fail;
        }
        return 0;
@@ -560,7 +560,7 @@ int vga_switcheroo_process_delayed_switch(void)
        if (!vgasr_priv.delayed_switch_active)
                goto err;
 
-       printk(KERN_INFO "vga_switcheroo: processing delayed switch to %d\n", vgasr_priv.delayed_client_id);
+       pr_info("vga_switcheroo: processing delayed switch to %d\n", vgasr_priv.delayed_client_id);
 
        client = find_client_from_id(&vgasr_priv.clients,
                                     vgasr_priv.delayed_client_id);
@@ -569,7 +569,7 @@ int vga_switcheroo_process_delayed_switch(void)
 
        ret = vga_switchto_stage2(client);
        if (ret)
-               printk(KERN_ERR "vga_switcheroo: delayed switching failed stage 2 %d\n", ret);
+               pr_err("vga_switcheroo: delayed switching failed stage 2 %d\n", ret);
 
        vgasr_priv.delayed_switch_active = false;
        err = 0;