mirror of https://gitee.com/openkylin/linux.git
Small fbdev fixes
- Compile fixes - atyfb initialization fix - Fix freeing of the irq in sh7760fb & nuc900fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJR91pDAAoJEPo9qoy8lh71xoEP/ipDE8HOk6prcaVqv6uVe1yn yCz/9605fIB2JkBKqPuhyPPVML/GmKsTsoLBWKJfzQMlpyPJfKjEp+qbzWxQouai T28rWchXZZEqAwDxBBhnZho7MYqOwUqQsDppXjEii8JpgRNEbbeNyTg1RhLMxDj8 +R3PBtrvm5qtoHbH1wU1JLzT3hDz2g1QTC3y1zg9LKjdx5gzVUR4MjeWb/tPCbKH UsnYwz2XKcklE8BmoFfTMShNrz4z1wwqwsAQrKsSekjJqcMEe4CP8mosvyvfvKrc dcw8AWN0e55kmCwU2bZe0YKQAXcwN3ZOe0JQli4xcZaXrJrlfkwTCbcKz5xYp3R7 qAkuo/EIO9IrWajUvsvJwTnUhA3LX9/b9FSyw6yTIiDEEcDX44RmQ+IOfzPf8tOO Kg7AvGtUUMARF+gFr3QgdPeHGBysYZJANnoDXYfvRbdewaBNQlyMgtilcLRs4QVa gYIlvxLIlRJrNpP7/YZWglYh83wC7ei9bhvP4358ydcWjhz9rn7PjvWNHpPeLIzi 2Vr1pbsRqU+gp6aVf/ltFodrwlCkKBtU9NBWGefM4GM93Y5Qb8KbE+yQN5LIoMSY s5fudtbsVbi9IiAyPddnzY8vYS0io1EVfyYvJuZSNXCNfuOcEywuG/8mq4yjGFEp jbg1eOL0Ryzr/1ABUnFy =UIHP -----END PGP SIGNATURE----- Merge tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux Pull fbdev fixes from Tomi Valkeinen: "Small fbdev fixes: - compile fixes - atyfb initialization fix - Fix freeing of the irq in sh7760fb & nuc900fb" * tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: video: sh7760fb: fix to pass correct device identity to free_irq() fbdev/atyfb: fix recent breakage in correct_chipset() fbdev/sgivwfb: fix compilation error in sgivwfb_mmap() video: nuc900fb: fix to pass correct device identity to request_irq() vga16fb: Remove unused variable video: xilinxfb: Fix compilation warning
This commit is contained in:
commit
ec8fa30667
|
@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
|
|||
const char *name;
|
||||
int i;
|
||||
|
||||
for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
|
||||
if (par->pci_id == aty_chips[i - 1].pci_id)
|
||||
for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
|
||||
if (par->pci_id == aty_chips[i].pci_id)
|
||||
break;
|
||||
|
||||
if (i < 0)
|
||||
|
|
|
@ -587,8 +587,7 @@ static int nuc900fb_probe(struct platform_device *pdev)
|
|||
fbinfo->flags = FBINFO_FLAG_DEFAULT;
|
||||
fbinfo->pseudo_palette = &fbi->pseudo_pal;
|
||||
|
||||
ret = request_irq(irq, nuc900fb_irqhandler, 0,
|
||||
pdev->name, fbinfo);
|
||||
ret = request_irq(irq, nuc900fb_irqhandler, 0, pdev->name, fbi);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n",
|
||||
irq, ret);
|
||||
|
|
|
@ -713,7 +713,7 @@ static int sgivwfb_mmap(struct fb_info *info,
|
|||
r = vm_iomap_memory(vma, sgivwfb_mem_phys, sgivwfb_mem_size);
|
||||
|
||||
printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n",
|
||||
offset, vma->vm_start);
|
||||
sgivwfb_mem_phys + (vma->vm_pgoff << PAGE_SHIFT), vma->vm_start);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
|
|
@ -567,7 +567,7 @@ static int sh7760fb_remove(struct platform_device *dev)
|
|||
fb_dealloc_cmap(&info->cmap);
|
||||
sh7760fb_free_mem(info);
|
||||
if (par->irq >= 0)
|
||||
free_irq(par->irq, par);
|
||||
free_irq(par->irq, &par->vsync);
|
||||
iounmap(par->base);
|
||||
release_mem_region(par->ioarea->start, resource_size(par->ioarea));
|
||||
framebuffer_release(info);
|
||||
|
|
|
@ -1265,7 +1265,6 @@ static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image
|
|||
|
||||
static void vga16fb_destroy(struct fb_info *info)
|
||||
{
|
||||
struct platform_device *dev = container_of(info->device, struct platform_device, dev);
|
||||
iounmap(info->screen_base);
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
/* XXX unshare VGA regions */
|
||||
|
|
|
@ -341,8 +341,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
|
|||
|
||||
if (drvdata->flags & BUS_ACCESS_FLAG) {
|
||||
/* Put a banner in the log (for DEBUG) */
|
||||
dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
|
||||
drvdata->regs);
|
||||
dev_dbg(dev, "regs: phys=%pa, virt=%p\n",
|
||||
&drvdata->regs_phys, drvdata->regs);
|
||||
}
|
||||
/* Put a banner in the log (for DEBUG) */
|
||||
dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
|
||||
|
|
Loading…
Reference in New Issue