diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/video/geode | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/geode')
| -rw-r--r-- | drivers/video/geode/gx1fb_core.c | 3 | ||||
| -rw-r--r-- | drivers/video/geode/gxfb_core.c | 3 | ||||
| -rw-r--r-- | drivers/video/geode/lxfb_core.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c index 2794ba1..ebbaada 100644 --- 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); - fb_info(info, "%s frame buffer device\n", info->fix.id); + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id); return 0; err: @@ -399,6 +399,7 @@ 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); } diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c index 1790f14..19f0c1ad 100644 --- a/drivers/video/geode/gxfb_core.c +++ b/drivers/video/geode/gxfb_core.c @@ -423,7 +423,7 @@ static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err; } pci_set_drvdata(pdev, info); - fb_info(info, "%s frame buffer device\n", info->fix.id); + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id); return 0; err: @@ -471,6 +471,7 @@ static void gxfb_remove(struct pci_dev *pdev) pci_release_region(pdev, 1); fb_dealloc_cmap(&info->cmap); + pci_set_drvdata(pdev, NULL); framebuffer_release(info); } diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c index 9e1d19d..4dd7b55 100644 --- a/drivers/video/geode/lxfb_core.c +++ b/drivers/video/geode/lxfb_core.c @@ -555,7 +555,8 @@ static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err; } pci_set_drvdata(pdev, info); - fb_info(info, "%s frame buffer device\n", info->fix.id); + printk(KERN_INFO "fb%d: %s frame buffer device\n", + info->node, info->fix.id); return 0; @@ -605,6 +606,7 @@ static void lxfb_remove(struct pci_dev *pdev) pci_release_region(pdev, 3); fb_dealloc_cmap(&info->cmap); + pci_set_drvdata(pdev, NULL); framebuffer_release(info); } |