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

[firefly-linux-kernel-4.4.55.git] / drivers / video / geode / gx1fb_core.c

diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index ebbaada7b94154c88650575f2f63253da096a387..2794ba11f33251c9b95a0a1099f3c68fcb89bbda 100644 (file)
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -357,7 +357,7 @@ static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto err;
        }
        pci_set_drvdata(pdev, info);
-       printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
+       fb_info(info, "%s frame buffer device\n", info->fix.id);
        return 0;
 
   err:
@@ -399,7 +399,6 @@ static void gx1fb_remove(struct pci_dev *pdev)
        release_mem_region(gx1_gx_base() + 0x8300, 0x100);
 
        fb_dealloc_cmap(&info->cmap);
-       pci_set_drvdata(pdev, NULL);
 
        framebuffer_release(info);
 }