iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbdev updates for kernel 6.4-rc1:

Browse Source 
- vt_buffer.h: Fix build on alpha (Randy Dunlap)
 - mmp: Clock handling fix (Christophe JAILLET)
 - 68328fb, ps3fb, vfb: Init .owner field of struct fb_ops (Thomas Zimmermann)
 - fbdev: cg14: Convert to platform remove callback returning void
 - Preparation patches to convert drivers to return void in .remove() callback
   (Uwe Kleine-König)
 - Drop Paul Mackerras as rage128 maintainer
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZElt5AAKCRD3ErUQojoP
 X1vWAQDGK0UQZJ2laQAkt9tULDwUs2ISIV6ujCJPRjBbg5GwLQEAkLrLZRap3QkL
 ic8dZPDnUNf3Ho9RbSjJIKge+zUHSgY=
 =D9Ln
 -----END PGP SIGNATURE-----

Merge tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev

Pull fbdev updates from Helge Deller:
 "Nothing really exiting in here.

  The majority of lines changed is due to Uwe's preparation patches to
  change the return value of the .remove() callback to void.

  Summary:

   - vt_buffer.h: Fix build on alpha (Randy Dunlap)

   - mmp: Clock handling fix (Christophe JAILLET)

   - 68328fb, ps3fb, vfb: Init .owner field of struct fb_ops (Thomas
     Zimmermann)

   - fbdev: cg14: Convert to platform remove callback returning void

   - Preparation patches to convert drivers to return void in .remove()
     callback (Uwe Kleine-König)

   - Drop Paul Mackerras as rage128 maintainer"

* tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (51 commits)
  MAINTAINERS: Remove rage128 framebuffer driver maintainer
  fbdev: vfb: Init owner field of struct fb_ops
  fbdev: ps3fb: Init owner field of struct fb_ops
  fbdev: 68328fb: Init owner field of struct fb_ops
  fbdev: mmp: Fix deferred clk handling in mmphw_probe()
  linux/vt_buffer.h: allow either builtin or modular for macros
  fbdev: xilinxfb: Convert to platform remove callback returning void
  fbdev: wmt_ge_rops: Convert to platform remove callback returning void
  fbdev: wm8505fb: Convert to platform remove callback returning void
  fbdev: vt8500lcdfb: Convert to platform remove callback returning void
  fbdev: via: Convert to platform remove callback returning void
  fbdev: vga16fb: Convert to platform remove callback returning void
  fbdev: vfb: Convert to platform remove callback returning void
  fbdev: vesafb: Convert to platform remove callback returning void
  fbdev: uvesafb: Convert to platform remove callback returning void
  fbdev: tcx: Convert to platform remove callback returning void
  fbdev: sm501fb: Convert to platform remove callback returning void
  fbdev: simplefb: Convert to platform remove callback returning void
  fbdev: sh_mobile_lcdcfb: Convert to platform remove callback returning void
  fbdev: sh7760fb: Convert to platform remove callback returning void
  ...
This commit is contained in:
Linus Torvalds 2023-04-27 11:19:51 -07:00
commit 725a345b2e
61 changed files with 121 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MAINTAINERS
View File

@ -17571,9 +17571,8 @@ F: drivers/block/rbd.c
F: drivers/block/rbd_types.h
RAGE128 FRAMEBUFFER DISPLAY DRIVER
M: Paul Mackerras <paulus@samba.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
S: Orphan
F: drivers/video/fbdev/aty/aty128fb.c
RAINSHADOW-CEC DRIVER

1
drivers/video/fbdev/68328fb.c
View File

@ -94,6 +94,7 @@ static int mc68x328fb_pan_display(struct fb_var_screeninfo *var,
static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma);
static const struct fb_ops mc68x328fb_ops = {
.owner = THIS_MODULE,
.fb_check_var = mc68x328fb_check_var,
.fb_set_par = mc68x328fb_set_par,
.fb_setcolreg = mc68x328fb_setcolreg,

6
drivers/video/fbdev/cg14.c
View File

@ -569,7 +569,7 @@ out_err:
return err;
}
static int cg14_remove(struct platform_device *op)
static void cg14_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg14_par *par = info->par;
@ -580,8 +580,6 @@ static int cg14_remove(struct platform_device *op)
cg14_unmap_regs(op, info, par);
framebuffer_release(info);
return 0;
}
static const struct of_device_id cg14_match[] = {
@ -598,7 +596,7 @@ static struct platform_driver cg14_driver = {
.of_match_table = cg14_match,
},
.probe = cg14_probe,
.remove = cg14_remove,
.remove_new = cg14_remove,
};
static int __init cg14_init(void)

6
drivers/video/fbdev/cg3.c
View File

@ -434,7 +434,7 @@ out_err:
return err;
}
static int cg3_remove(struct platform_device *op)
static void cg3_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg3_par *par = info->par;
@ -446,8 +446,6 @@ static int cg3_remove(struct platform_device *op)
of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
framebuffer_release(info);
return 0;
}
static const struct of_device_id cg3_match[] = {
@ -467,7 +465,7 @@ static struct platform_driver cg3_driver = {
.of_match_table = cg3_match,
},
.probe = cg3_probe,
.remove = cg3_remove,
.remove_new = cg3_remove,
};
static int __init cg3_init(void)

6
drivers/video/fbdev/cg6.c
View File

@ -828,7 +828,7 @@ out_err:
return err;
}
static int cg6_remove(struct platform_device *op)
static void cg6_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg6_par *par = info->par;
@ -839,8 +839,6 @@ static int cg6_remove(struct platform_device *op)
cg6_unmap_regs(op, info, par);
framebuffer_release(info);
return 0;
}
static const struct of_device_id cg6_match[] = {
@ -860,7 +858,7 @@ static struct platform_driver cg6_driver = {
.of_match_table = cg6_match,
},
.probe = cg6_probe,
.remove = cg6_remove,
.remove_new = cg6_remove,
};
static int __init cg6_init(void)

6
drivers/video/fbdev/clps711x-fb.c
View File

@ -350,7 +350,7 @@ out_fb_release:
return ret;
}
static int clps711x_fb_remove(struct platform_device *pdev)
static void clps711x_fb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct clps711x_fb_info *cfb = info->par;
@ -360,8 +360,6 @@ static int clps711x_fb_remove(struct platform_device *pdev)
unregister_framebuffer(info);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
return 0;
}
static const struct of_device_id clps711x_fb_dt_ids[] = {
@ -376,7 +374,7 @@ static struct platform_driver clps711x_fb_driver = {
.of_match_table = clps711x_fb_dt_ids,
},
.probe = clps711x_fb_probe,
.remove = clps711x_fb_remove,
.remove_new = clps711x_fb_remove,
};
module_platform_driver(clps711x_fb_driver);

6
drivers/video/fbdev/cobalt_lcdfb.c
View File

@ -324,7 +324,7 @@ static int cobalt_lcdfb_probe(struct platform_device *dev)
return 0;
}
static int cobalt_lcdfb_remove(struct platform_device *dev)
static void cobalt_lcdfb_remove(struct platform_device *dev)
{
struct fb_info *info;
@ -333,13 +333,11 @@ static int cobalt_lcdfb_remove(struct platform_device *dev)
unregister_framebuffer(info);
framebuffer_release(info);
}
return 0;
}
static struct platform_driver cobalt_lcdfb_driver = {
.probe = cobalt_lcdfb_probe,
.remove = cobalt_lcdfb_remove,
.remove_new = cobalt_lcdfb_remove,
.driver = {
.name = "cobalt-lcd",
},

6
drivers/video/fbdev/da8xx-fb.c
View File

@ -1064,7 +1064,7 @@ static void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
}
#endif
static int fb_remove(struct platform_device *dev)
static void fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
struct da8xx_fb_par *par = info->par;
@ -1091,8 +1091,6 @@ static int fb_remove(struct platform_device *dev)
pm_runtime_put_sync(&dev->dev);
pm_runtime_disable(&dev->dev);
framebuffer_release(info);
return 0;
}
/*
@ -1657,7 +1655,7 @@ static SIMPLE_DEV_PM_OPS(fb_pm_ops, fb_suspend, fb_resume);
static struct platform_driver da8xx_fb_driver = {
.probe = fb_probe,
.remove = fb_remove,
.remove_new = fb_remove,
.driver = {
.name = DRIVER_NAME,
.pm = &fb_pm_ops,

6
drivers/video/fbdev/efifb.c
View File

@ -621,15 +621,13 @@ err_release_mem:
return err;
}
static int efifb_remove(struct platform_device *pdev)
static void efifb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
/* efifb_destroy takes care of info cleanup */
unregister_framebuffer(info);
sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
return 0;
}
static struct platform_driver efifb_driver = {
@ -637,7 +635,7 @@ static struct platform_driver efifb_driver = {
.name = "efi-framebuffer",
},
.probe = efifb_probe,
.remove = efifb_remove,
.remove_new = efifb_remove,
};
builtin_platform_driver(efifb_driver);

6
drivers/video/fbdev/ep93xx-fb.c
View File

@ -573,7 +573,7 @@ failed_cmap:
return err;
}
static int ep93xxfb_remove(struct platform_device *pdev)
static void ep93xxfb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct ep93xx_fbi *fbi = info->par;
@ -587,13 +587,11 @@ static int ep93xxfb_remove(struct platform_device *pdev)
fbi->mach_info->teardown(pdev);
kfree(info);
return 0;
}
static struct platform_driver ep93xxfb_driver = {
.probe = ep93xxfb_probe,
.remove = ep93xxfb_remove,
.remove_new = ep93xxfb_remove,
.driver = {
.name = "ep93xx-fb",
},

6
drivers/video/fbdev/ffb.c
View File

@ -1023,7 +1023,7 @@ out_err:
return err;
}
static int ffb_remove(struct platform_device *op)
static void ffb_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct ffb_par *par = info->par;
@ -1035,8 +1035,6 @@ static int ffb_remove(struct platform_device *op)
of_iounmap(&op->resource[1], par->dac, sizeof(struct ffb_dac));
framebuffer_release(info);
return 0;
}
static const struct of_device_id ffb_match[] = {
@ -1056,7 +1054,7 @@ static struct platform_driver ffb_driver = {
.of_match_table = ffb_match,
},
.probe = ffb_probe,
.remove = ffb_remove,
.remove_new = ffb_remove,
};
static int __init ffb_init(void)

6
drivers/video/fbdev/fsl-diu-fb.c
View File

@ -1823,7 +1823,7 @@ error:
return ret;
}
static int fsl_diu_remove(struct platform_device *pdev)
static void fsl_diu_remove(struct platform_device *pdev)
{
struct fsl_diu_data *data;
int i;
@ -1837,8 +1837,6 @@ static int fsl_diu_remove(struct platform_device *pdev)
uninstall_fb(&data->fsl_diu_info[i]);
iounmap(data->diu_reg);
return 0;
}
#ifndef MODULE
@ -1885,7 +1883,7 @@ static struct platform_driver fsl_diu_driver = {
.of_match_table = fsl_diu_match,
},
.probe = fsl_diu_probe,
.remove = fsl_diu_remove,
.remove_new = fsl_diu_remove,
.suspend = fsl_diu_suspend,
.resume = fsl_diu_resume,
};

6
drivers/video/fbdev/gbefb.c
View File

@ -1233,7 +1233,7 @@ out_release_framebuffer:
return ret;
}
static int gbefb_remove(struct platform_device* p_dev)
static void gbefb_remove(struct platform_device* p_dev)
{
struct fb_info *info = platform_get_drvdata(p_dev);
struct gbefb_par *par = info->par;
@ -1243,13 +1243,11 @@ static int gbefb_remove(struct platform_device* p_dev)
arch_phys_wc_del(par->wc_cookie);
release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
framebuffer_release(info);
return 0;
}
static struct platform_driver gbefb_driver = {
.probe = gbefb_probe,
.remove = gbefb_remove,
.remove_new = gbefb_remove,
.driver = {
.name = "gbefb",
.dev_groups = gbefb_groups,

5
drivers/video/fbdev/goldfishfb.c
View File

@ -283,7 +283,7 @@ err_fb_alloc_failed:
return ret;
}
static int goldfish_fb_remove(struct platform_device *pdev)
static void goldfish_fb_remove(struct platform_device *pdev)
{
size_t framesize;
struct goldfish_fb *fb = platform_get_drvdata(pdev);
@ -296,7 +296,6 @@ static int goldfish_fb_remove(struct platform_device *pdev)
fb->fb.fix.smem_start);
iounmap(fb->reg_base);
kfree(fb);
return 0;
}
static const struct of_device_id goldfish_fb_of_match[] = {
@ -315,7 +314,7 @@ MODULE_DEVICE_TABLE(acpi, goldfish_fb_acpi_match);
static struct platform_driver goldfish_fb_driver = {
.probe = goldfish_fb_probe,
.remove = goldfish_fb_remove,
.remove_new = goldfish_fb_remove,
.driver = {
.name = "goldfish_fb",
.of_match_table = goldfish_fb_of_match,

6
drivers/video/fbdev/grvga.c
View File

@ -504,7 +504,7 @@ free_fb:
return retval;
}
static int grvga_remove(struct platform_device *device)
static void grvga_remove(struct platform_device *device)
{
struct fb_info *info = dev_get_drvdata(&device->dev);
struct grvga_par *par;
@ -524,8 +524,6 @@ static int grvga_remove(struct platform_device *device)
framebuffer_release(info);
}
return 0;
}
static struct of_device_id svgactrl_of_match[] = {
@ -545,7 +543,7 @@ static struct platform_driver grvga_driver = {
.of_match_table = svgactrl_of_match,
},
.probe = grvga_probe,
.remove = grvga_remove,
.remove_new = grvga_remove,
};
module_platform_driver(grvga_driver);

5
drivers/video/fbdev/hecubafb.c
View File

@ -279,7 +279,7 @@ err_videomem_alloc:
return retval;
}
static int hecubafb_remove(struct platform_device *dev)
static void hecubafb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
@ -293,12 +293,11 @@ static int hecubafb_remove(struct platform_device *dev)
module_put(par->board->owner);
framebuffer_release(info);
}
return 0;
}
static struct platform_driver hecubafb_driver = {
.probe = hecubafb_probe,
.remove = hecubafb_remove,
.remove_new = hecubafb_remove,
.driver = {
.name = "hecubafb",
},

6
drivers/video/fbdev/hgafb.c
View File

@ -595,7 +595,7 @@ static int hgafb_probe(struct platform_device *pdev)
return 0;
}
static int hgafb_remove(struct platform_device *pdev)
static void hgafb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
@ -614,13 +614,11 @@ static int hgafb_remove(struct platform_device *pdev)
if (release_io_port)
release_region(0x3bf, 1);
return 0;
}
static struct platform_driver hgafb_driver = {
.probe = hgafb_probe,
.remove = hgafb_remove,
.remove_new = hgafb_remove,
.driver = {
.name = "hgafb",
},

6
drivers/video/fbdev/hitfb.c
View File

@ -415,15 +415,13 @@ err_fb:
return ret;
}
static int hitfb_remove(struct platform_device *dev)
static void hitfb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
unregister_framebuffer(info);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
return 0;
}
static int hitfb_suspend(struct device *dev)
@ -460,7 +458,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = {
static struct platform_driver hitfb_driver = {
.probe = hitfb_probe,
.remove = hitfb_remove,
.remove_new = hitfb_remove,
.driver = {
.name = "hitfb",
.pm = &hitfb_dev_pm_ops,

6
drivers/video/fbdev/imxfb.c
View File

@ -1051,7 +1051,7 @@ failed_init:
return ret;
}
static int imxfb_remove(struct platform_device *pdev)
static void imxfb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct imxfb_info *fbi = info->par;
@ -1064,8 +1064,6 @@ static int imxfb_remove(struct platform_device *pdev)
fbi->map_dma);
kfree(info->pseudo_palette);
framebuffer_release(info);
return 0;
}
static int __maybe_unused imxfb_suspend(struct device *dev)
@ -1097,7 +1095,7 @@ static struct platform_driver imxfb_driver = {
.pm = &imxfb_pm_ops,
},
.probe = imxfb_probe,
.remove = imxfb_remove,
.remove_new = imxfb_remove,
.id_table = imxfb_devtype,
};
module_platform_driver(imxfb_driver);

6
drivers/video/fbdev/leo.c
View File

@ -637,7 +637,7 @@ out_err:
return err;
}
static int leo_remove(struct platform_device *op)
static void leo_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct leo_par *par = info->par;
@ -648,8 +648,6 @@ static int leo_remove(struct platform_device *op)
leo_unmap_regs(op, info, par);
framebuffer_release(info);
return 0;
}
static const struct of_device_id leo_match[] = {
@ -666,7 +664,7 @@ static struct platform_driver leo_driver = {
.of_match_table = leo_match,
},
.probe = leo_probe,
.remove = leo_remove,
.remove_new = leo_remove,
};
static int __init leo_init(void)

5
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
View File

@ -784,7 +784,7 @@ fbrel:
return ret;
}
static int of_platform_mb862xx_remove(struct platform_device *ofdev)
static void of_platform_mb862xx_remove(struct platform_device *ofdev)
{
struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
struct mb862xxfb_par *par = fbi->par;
@ -814,7 +814,6 @@ static int of_platform_mb862xx_remove(struct platform_device *ofdev)
release_mem_region(par->res->start, res_size);
framebuffer_release(fbi);
return 0;
}
/*
@ -838,7 +837,7 @@ static struct platform_driver of_platform_mb862xxfb_driver = {
.of_match_table = of_platform_mb862xx_tbl,
},
.probe = of_platform_mb862xx_probe,
.remove = of_platform_mb862xx_remove,
.remove_new = of_platform_mb862xx_remove,
};
#endif

5
drivers/video/fbdev/metronomefb.c
View File

@ -744,7 +744,7 @@ err:
return retval;
}
static int metronomefb_remove(struct platform_device *dev)
static void metronomefb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
@ -761,12 +761,11 @@ static int metronomefb_remove(struct platform_device *dev)
dev_dbg(&dev->dev, "calling release\n");
framebuffer_release(info);
}
return 0;
}
static struct platform_driver metronomefb_driver = {
.probe = metronomefb_probe,
.remove = metronomefb_remove,
.remove_new = metronomefb_remove,
.driver = {
.name = "metronomefb",
},

2
drivers/video/fbdev/mmp/hw/mmp_ctrl.c
View File

@ -514,9 +514,9 @@ static int mmphw_probe(struct platform_device *pdev)
/* get clock */
ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name);
if (IS_ERR(ctrl->clk)) {
ret = PTR_ERR(ctrl->clk);
dev_err_probe(ctrl->dev, ret,
"unable to get clk %s\n", mi->clk_name);
ret = -ENOENT;
goto failed;
}
clk_prepare_enable(ctrl->clk);

5
drivers/video/fbdev/mx3fb.c
View File

@ -1616,7 +1616,7 @@ eremap:
return ret;
}
static int mx3fb_remove(struct platform_device *dev)
static void mx3fb_remove(struct platform_device *dev)
{
struct mx3fb_data *mx3fb = platform_get_drvdata(dev);
struct fb_info *fbi = mx3fb->fbi;
@ -1632,7 +1632,6 @@ static int mx3fb_remove(struct platform_device *dev)
dmaengine_put();
iounmap(mx3fb->reg_base);
return 0;
}
static struct platform_driver mx3fb_driver = {
@ -1640,7 +1639,7 @@ static struct platform_driver mx3fb_driver = {
.name = MX3FB_NAME,
},
.probe = mx3fb_probe,
.remove = mx3fb_remove,
.remove_new = mx3fb_remove,
.suspend = mx3fb_suspend,
.resume = mx3fb_resume,
};

6
drivers/video/fbdev/ocfb.c
View File

@ -370,7 +370,7 @@ err_dma_free:
return ret;
}
static int ocfb_remove(struct platform_device *pdev)
static void ocfb_remove(struct platform_device *pdev)
{
struct ocfb_dev *fbdev = platform_get_drvdata(pdev);
@ -383,8 +383,6 @@ static int ocfb_remove(struct platform_device *pdev)
ocfb_writereg(fbdev, OCFB_CTRL, 0);
platform_set_drvdata(pdev, NULL);
return 0;
}
static const struct of_device_id ocfb_match[] = {
@ -395,7 +393,7 @@ MODULE_DEVICE_TABLE(of, ocfb_match);
static struct platform_driver ocfb_driver = {
.probe = ocfb_probe,
.remove = ocfb_remove,
.remove_new = ocfb_remove,
.driver = {
.name = "ocfb_fb",
.of_match_table = ocfb_match,

8
drivers/video/fbdev/offb.c
View File

@ -658,14 +658,12 @@ static void offb_init_nodriver(struct platform_device *parent, struct device_nod
}
}
static int offb_remove(struct platform_device *pdev)
static void offb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
if (info)
unregister_framebuffer(info);
return 0;
}
static int offb_probe_bootx_noscreen(struct platform_device *pdev)
@ -680,7 +678,7 @@ static struct platform_driver offb_driver_bootx_noscreen = {
.name = "bootx-noscreen",
},
.probe = offb_probe_bootx_noscreen,
.remove = offb_remove,
.remove_new = offb_remove,
};
static int offb_probe_display(struct platform_device *pdev)
@ -702,7 +700,7 @@ static struct platform_driver offb_driver_display = {
.of_match_table = offb_of_match_display,
},
.probe = offb_probe_display,
.remove = offb_remove,
.remove_new = offb_remove,
};
static int __init offb_init(void)

6
drivers/video/fbdev/omap/omapfb_main.c
View File

@ -1799,7 +1799,7 @@ void omapfb_register_panel(struct lcd_panel *panel)
EXPORT_SYMBOL_GPL(omapfb_register_panel);
/* Called when the device is being detached from the driver */
static int omapfb_remove(struct platform_device *pdev)
static void omapfb_remove(struct platform_device *pdev)
{
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
enum omapfb_state saved_state = fbdev->state;
@ -1811,8 +1811,6 @@ static int omapfb_remove(struct platform_device *pdev)
platform_device_unregister(&omapdss_device);
fbdev->dssdev = NULL;
return 0;
}
/* PM suspend */
@ -1837,7 +1835,7 @@ static int omapfb_resume(struct platform_device *pdev)
static struct platform_driver omapfb_driver = {
.probe = omapfb_probe,
.remove = omapfb_remove,
.remove_new = omapfb_remove,
.suspend = omapfb_suspend,
.resume = omapfb_resume,
.driver = {

6
drivers/video/fbdev/omap2/omapfb/dss/core.c
View File

@ -171,13 +171,11 @@ static int __init omap_dss_probe(struct platform_device *pdev)
return 0;
}
static int omap_dss_remove(struct platform_device *pdev)
static void omap_dss_remove(struct platform_device *pdev)
{
unregister_pm_notifier(&omap_dss_pm_notif_block);
dss_uninitialize_debugfs();
return 0;
}
static void omap_dss_shutdown(struct platform_device *pdev)
@ -187,7 +185,7 @@ static void omap_dss_shutdown(struct platform_device *pdev)
}
static struct platform_driver omap_dss_driver = {
.remove = omap_dss_remove,
.remove_new = omap_dss_remove,
.shutdown = omap_dss_shutdown,
.driver = {
.name = "omapdss",

5
drivers/video/fbdev/omap2/omapfb/dss/dispc.c
View File

@ -4017,10 +4017,9 @@ static int dispc_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &dispc_component_ops);
}
static int dispc_remove(struct platform_device *pdev)
static void dispc_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &dispc_component_ops);
return 0;
}
static int dispc_runtime_suspend(struct device *dev)
@ -4073,7 +4072,7 @@ static const struct of_device_id dispc_of_match[] = {
static struct platform_driver omap_dispchw_driver = {
.probe = dispc_probe,
.remove = dispc_remove,
.remove_new = dispc_remove,
.driver = {
.name = "omapdss_dispc",
.pm = &dispc_pm_ops,

5
drivers/video/fbdev/omap2/omapfb/dss/dpi.c
View File

@ -810,15 +810,14 @@ static int dpi_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &dpi_component_ops);
}
static int dpi_remove(struct platform_device *pdev)
static void dpi_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &dpi_component_ops);
return 0;
}
static struct platform_driver omap_dpi_driver = {
.probe = dpi_probe,
.remove = dpi_remove,
.remove_new = dpi_remove,
.driver = {
.name = "omapdss_dpi",
.suppress_bind_attrs = true,

5
drivers/video/fbdev/omap2/omapfb/dss/dsi.c
View File

@ -5495,10 +5495,9 @@ static int dsi_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &dsi_component_ops);
}
static int dsi_remove(struct platform_device *pdev)
static void dsi_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &dsi_component_ops);
return 0;
}
static int dsi_runtime_suspend(struct device *dev)
@ -5565,7 +5564,7 @@ static const struct of_device_id dsi_of_match[] = {
static struct platform_driver omap_dsihw_driver = {
.probe = dsi_probe,
.remove = dsi_remove,
.remove_new = dsi_remove,
.driver = {
.name = "omapdss_dsi",
.pm = &dsi_pm_ops,

5
drivers/video/fbdev/omap2/omapfb/dss/dss.c
View File

@ -1224,10 +1224,9 @@ static int dss_probe(struct platform_device *pdev)
return 0;
}
static int dss_remove(struct platform_device *pdev)
static void dss_remove(struct platform_device *pdev)
{
component_master_del(&pdev->dev, &dss_component_ops);
return 0;
}
static int dss_runtime_suspend(struct device *dev)
@ -1279,7 +1278,7 @@ MODULE_DEVICE_TABLE(of, dss_of_match);
static struct platform_driver omap_dsshw_driver = {
.probe = dss_probe,
.remove = dss_remove,
.remove_new = dss_remove,
.driver = {
.name = "omapdss_dss",
.pm = &dss_pm_ops,

5
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
View File

@ -756,10 +756,9 @@ static int hdmi4_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &hdmi4_component_ops);
}
static int hdmi4_remove(struct platform_device *pdev)
static void hdmi4_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &hdmi4_component_ops);
return 0;
}
static int hdmi_runtime_suspend(struct device *dev)
@ -792,7 +791,7 @@ static const struct of_device_id hdmi_of_match[] = {
static struct platform_driver omapdss_hdmihw_driver = {
.probe = hdmi4_probe,
.remove = hdmi4_remove,
.remove_new = hdmi4_remove,
.driver = {
.name = "omapdss_hdmi",
.pm = &hdmi_pm_ops,

5
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
View File

@ -797,10 +797,9 @@ static int hdmi5_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &hdmi5_component_ops);
}
static int hdmi5_remove(struct platform_device *pdev)
static void hdmi5_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &hdmi5_component_ops);
return 0;
}
static int hdmi_runtime_suspend(struct device *dev)
@ -834,7 +833,7 @@ static const struct of_device_id hdmi_of_match[] = {
static struct platform_driver omapdss_hdmihw_driver = {
.probe = hdmi5_probe,
.remove = hdmi5_remove,
.remove_new = hdmi5_remove,
.driver = {
.name = "omapdss_hdmi5",
.pm = &hdmi_pm_ops,

5
drivers/video/fbdev/omap2/omapfb/dss/sdi.c
View File

@ -375,15 +375,14 @@ static int sdi_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &sdi_component_ops);
}
static int sdi_remove(struct platform_device *pdev)
static void sdi_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &sdi_component_ops);
return 0;
}
static struct platform_driver omap_sdi_driver = {
.probe = sdi_probe,
.remove = sdi_remove,
.remove_new = sdi_remove,
.driver = {
.name = "omapdss_sdi",
.suppress_bind_attrs = true,

5
drivers/video/fbdev/omap2/omapfb/dss/venc.c
View File

@ -880,10 +880,9 @@ static int venc_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &venc_component_ops);
}
static int venc_remove(struct platform_device *pdev)
static void venc_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &venc_component_ops);
return 0;
}
static int venc_runtime_suspend(struct device *dev)
@ -922,7 +921,7 @@ static const struct of_device_id venc_of_match[] = {
static struct platform_driver omap_venchw_driver = {
.probe = venc_probe,
.remove = venc_remove,
.remove_new = venc_remove,
.driver = {
.name = "omapdss_venc",
.pm = &venc_pm_ops,

6
drivers/video/fbdev/omap2/omapfb/omapfb-main.c
View File

@ -2599,7 +2599,7 @@ err0:
return r;
}
static int omapfb_remove(struct platform_device *pdev)
static void omapfb_remove(struct platform_device *pdev)
{
struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
@ -2610,13 +2610,11 @@ static int omapfb_remove(struct platform_device *pdev)
omapfb_free_resources(fbdev);
omapdss_compat_uninit();
return 0;
}
static struct platform_driver omapfb_driver = {
.probe = omapfb_probe,
.remove = omapfb_remove,
.remove_new = omapfb_remove,
.driver = {
.name = "omapfb",
},

6
drivers/video/fbdev/p9100.c
View File

@ -327,7 +327,7 @@ out_err:
return err;
}
static int p9100_remove(struct platform_device *op)
static void p9100_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct p9100_par *par = info->par;
@ -339,8 +339,6 @@ static int p9100_remove(struct platform_device *op)
of_iounmap(&op->resource[2], info->screen_base, info->fix.smem_len);
framebuffer_release(info);
return 0;
}
static const struct of_device_id p9100_match[] = {
@ -357,7 +355,7 @@ static struct platform_driver p9100_driver = {
.of_match_table = p9100_match,
},
.probe = p9100_probe,
.remove = p9100_remove,
.remove_new = p9100_remove,
};
static int __init p9100_init(void)

6
drivers/video/fbdev/platinumfb.c
View File

@ -636,7 +636,7 @@ static int platinumfb_probe(struct platform_device* odev)
return rc;
}
static int platinumfb_remove(struct platform_device* odev)
static void platinumfb_remove(struct platform_device* odev)
{
struct fb_info *info = dev_get_drvdata(&odev->dev);
struct fb_info_platinum *pinfo = info->par;
@ -654,8 +654,6 @@ static int platinumfb_remove(struct platform_device* odev)
release_mem_region(pinfo->cmap_regs_phys, 0x1000);
framebuffer_release(info);
return 0;
}
static struct of_device_id platinumfb_match[] =
@ -673,7 +671,7 @@ static struct platform_driver platinum_driver =
.of_match_table = platinumfb_match,
},
.probe = platinumfb_probe,
.remove = platinumfb_remove,
.remove_new = platinumfb_remove,
};
static int __init platinumfb_init(void)

1
drivers/video/fbdev/ps3fb.c
View File

@ -936,6 +936,7 @@ static irqreturn_t ps3fb_vsync_interrupt(int irq, void *ptr)
static const struct fb_ops ps3fb_ops = {
.owner = THIS_MODULE,
.fb_open = ps3fb_open,
.fb_release = ps3fb_release,
.fb_read = fb_sys_read,

8
drivers/video/fbdev/pxa168fb.c
View File

@ -765,14 +765,14 @@ failed_free_info:
return ret;
}
static int pxa168fb_remove(struct platform_device *pdev)
static void pxa168fb_remove(struct platform_device *pdev)
{
struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
struct fb_info *info;
unsigned int data;
if (!fbi)
return 0;
return;
/* disable DMA transfer */
data = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
@ -794,8 +794,6 @@ static int pxa168fb_remove(struct platform_device *pdev)
clk_disable_unprepare(fbi->clk);
framebuffer_release(info);
return 0;
}
static struct platform_driver pxa168fb_driver = {
@ -803,7 +801,7 @@ static struct platform_driver pxa168fb_driver = {
.name = "pxa168-fb",
},
.probe = pxa168fb_probe,
.remove = pxa168fb_remove,
.remove_new = pxa168fb_remove,
};
module_platform_driver(pxa168fb_driver);

6
drivers/video/fbdev/pxa3xx-gcu.c
View File

@ -675,7 +675,7 @@ err_free_dma:
return ret;
}
static int pxa3xx_gcu_remove(struct platform_device *pdev)
static void pxa3xx_gcu_remove(struct platform_device *pdev)
{
struct pxa3xx_gcu_priv *priv = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
@ -685,8 +685,6 @@ static int pxa3xx_gcu_remove(struct platform_device *pdev)
dma_free_coherent(dev, SHARED_SIZE, priv->shared, priv->shared_phys);
clk_disable_unprepare(priv->clk);
pxa3xx_gcu_free_buffers(dev, priv);
return 0;
}
#ifdef CONFIG_OF
@ -699,7 +697,7 @@ MODULE_DEVICE_TABLE(of, pxa3xx_gcu_of_match);
static struct platform_driver pxa3xx_gcu_driver = {
.probe = pxa3xx_gcu_probe,
.remove = pxa3xx_gcu_remove,
.remove_new = pxa3xx_gcu_remove,
.driver = {
.name = DRV_NAME,
.of_match_table = of_match_ptr(pxa3xx_gcu_of_match),

8
drivers/video/fbdev/pxafb.c
View File

@ -2396,13 +2396,13 @@ failed:
return ret;
}
static int pxafb_remove(struct platform_device *dev)
static void pxafb_remove(struct platform_device *dev)
{
struct pxafb_info *fbi = platform_get_drvdata(dev);
struct fb_info *info;
if (!fbi)
return 0;
return;
info = &fbi->fb;
@ -2418,8 +2418,6 @@ static int pxafb_remove(struct platform_device *dev)
dma_free_coherent(&dev->dev, fbi->dma_buff_size, fbi->dma_buff,
fbi->dma_buff_phys);
return 0;
}
static const struct of_device_id pxafb_of_dev_id[] = {
@ -2432,7 +2430,7 @@ MODULE_DEVICE_TABLE(of, pxafb_of_dev_id);
static struct platform_driver pxafb_driver = {
.probe = pxafb_probe,
.remove = pxafb_remove,
.remove_new = pxafb_remove,
.driver = {
.name = "pxa2xx-fb",
.of_match_table = pxafb_of_dev_id,

5
drivers/video/fbdev/s1d13xxxfb.c
View File

@ -748,13 +748,12 @@ static void __s1d13xxxfb_remove(struct platform_device *pdev)
resource_size(&pdev->resource[1]));
}
static int s1d13xxxfb_remove(struct platform_device *pdev)
static void s1d13xxxfb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
unregister_framebuffer(info);
__s1d13xxxfb_remove(pdev);
return 0;
}
static int s1d13xxxfb_probe(struct platform_device *pdev)
@ -995,7 +994,7 @@ static int s1d13xxxfb_resume(struct platform_device *dev)
static struct platform_driver s1d13xxxfb_driver = {
.probe = s1d13xxxfb_probe,
.remove = s1d13xxxfb_remove,
.remove_new = s1d13xxxfb_remove,
#ifdef CONFIG_PM
.suspend = s1d13xxxfb_suspend,
.resume = s1d13xxxfb_resume,

6
drivers/video/fbdev/s3c-fb.c
View File

@ -1507,7 +1507,7 @@ err_bus_clk:
* Shutdown and then release all the resources that the driver allocated
* on initialisation.
*/
static int s3c_fb_remove(struct platform_device *pdev)
static void s3c_fb_remove(struct platform_device *pdev)
{
struct s3c_fb *sfb = platform_get_drvdata(pdev);
int win;
@ -1525,8 +1525,6 @@ static int s3c_fb_remove(struct platform_device *pdev)
pm_runtime_put_sync(sfb->dev);
pm_runtime_disable(sfb->dev);
return 0;
}
#ifdef CONFIG_PM_SLEEP
@ -1794,7 +1792,7 @@ static const struct dev_pm_ops s3cfb_pm_ops = {
static struct platform_driver s3c_fb_driver = {
.probe = s3c_fb_probe,
.remove = s3c_fb_remove,
.remove_new = s3c_fb_remove,
.id_table = s3c_fb_driver_ids,
.driver = {
.name = "s3c-fb",

6
drivers/video/fbdev/sh7760fb.c
View File

@ -554,7 +554,7 @@ out_fb:
return ret;
}
static int sh7760fb_remove(struct platform_device *dev)
static void sh7760fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
struct sh7760fb_par *par = info->par;
@ -568,8 +568,6 @@ static int sh7760fb_remove(struct platform_device *dev)
iounmap(par->base);
release_mem_region(par->ioarea->start, resource_size(par->ioarea));
framebuffer_release(info);
return 0;
}
static struct platform_driver sh7760_lcdc_driver = {
@ -577,7 +575,7 @@ static struct platform_driver sh7760_lcdc_driver = {
.name = "sh7760-lcdc",
},
.probe = sh7760fb_probe,
.remove = sh7760fb_remove,
.remove_new = sh7760fb_remove,
};
module_platform_driver(sh7760_lcdc_driver);

5
drivers/video/fbdev/sh_mobile_lcdcfb.c
View File

@ -2249,7 +2249,7 @@ static const struct fb_videomode default_720p = {
.sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
};
static int sh_mobile_lcdc_remove(struct platform_device *pdev)
static void sh_mobile_lcdc_remove(struct platform_device *pdev)
{
struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);
unsigned int i;
@ -2305,7 +2305,6 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
if (priv->irq)
free_irq(priv->irq, priv);
kfree(priv);
return 0;
}
static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
@ -2656,7 +2655,7 @@ static struct platform_driver sh_mobile_lcdc_driver = {
.pm = &sh_mobile_lcdc_dev_pm_ops,
},
.probe = sh_mobile_lcdc_probe,
.remove = sh_mobile_lcdc_remove,
.remove_new = sh_mobile_lcdc_remove,
};
module_platform_driver(sh_mobile_lcdc_driver);

6
drivers/video/fbdev/simplefb.c
View File

@ -538,14 +538,12 @@ error_release_mem_region:
return ret;
}
static int simplefb_remove(struct platform_device *pdev)
static void simplefb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
/* simplefb_destroy takes care of info cleanup */
unregister_framebuffer(info);
return 0;
}
static const struct of_device_id simplefb_of_match[] = {
@ -560,7 +558,7 @@ static struct platform_driver simplefb_driver = {
.of_match_table = simplefb_of_match,
},
.probe = simplefb_probe,
.remove = simplefb_remove,
.remove_new = simplefb_remove,
};
module_platform_driver(simplefb_driver);

6
drivers/video/fbdev/sm501fb.c
View File

@ -2045,7 +2045,7 @@ err_alloc:
/*
* Cleanup
*/
static int sm501fb_remove(struct platform_device *pdev)
static void sm501fb_remove(struct platform_device *pdev)
{
struct sm501fb_info *info = platform_get_drvdata(pdev);
struct fb_info *fbinfo_crt = info->fb[0];
@ -2064,8 +2064,6 @@ static int sm501fb_remove(struct platform_device *pdev)
framebuffer_release(fbinfo_pnl);
framebuffer_release(fbinfo_crt);
return 0;
}
#ifdef CONFIG_PM
@ -2209,7 +2207,7 @@ static int sm501fb_resume(struct platform_device *pdev)
static struct platform_driver sm501fb_driver = {
.probe = sm501fb_probe,
.remove = sm501fb_remove,
.remove_new = sm501fb_remove,
.suspend = sm501fb_suspend,
.resume = sm501fb_resume,
.driver = {

6
drivers/video/fbdev/tcx.c
View File

@ -486,7 +486,7 @@ out_err:
return err;
}
static int tcx_remove(struct platform_device *op)
static void tcx_remove(struct platform_device *op)
{
struct fb_info *info = dev_get_drvdata(&op->dev);
struct tcx_par *par = info->par;
@ -497,8 +497,6 @@ static int tcx_remove(struct platform_device *op)
tcx_unmap_regs(op, info, par);
framebuffer_release(info);
return 0;
}
static const struct of_device_id tcx_match[] = {
@ -515,7 +513,7 @@ static struct platform_driver tcx_driver = {
.of_match_table = tcx_match,
},
.probe = tcx_probe,
.remove = tcx_remove,
.remove_new = tcx_remove,
};
static int __init tcx_init(void)

6
drivers/video/fbdev/uvesafb.c
View File

@ -1774,7 +1774,7 @@ out:
return err;
}
static int uvesafb_remove(struct platform_device *dev)
static void uvesafb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
struct uvesafb_par *par = info->par;
@ -1793,13 +1793,11 @@ static int uvesafb_remove(struct platform_device *dev)
kfree(par->vbe_state_saved);
framebuffer_release(info);
return 0;
}
static struct platform_driver uvesafb_driver = {
.probe = uvesafb_probe,
.remove = uvesafb_remove,
.remove_new = uvesafb_remove,
.driver = {
.name = "uvesafb",
},

6
drivers/video/fbdev/vesafb.c
View File

@ -485,7 +485,7 @@ err_release_region:
return err;
}
static int vesafb_remove(struct platform_device *pdev)
static void vesafb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
@ -494,8 +494,6 @@ static int vesafb_remove(struct platform_device *pdev)
/* vesafb_destroy takes care of info cleanup */
unregister_framebuffer(info);
return 0;
}
static struct platform_driver vesafb_driver = {
@ -503,7 +501,7 @@ static struct platform_driver vesafb_driver = {
.name = "vesa-framebuffer",
},
.probe = vesafb_probe,
.remove = vesafb_remove,
.remove_new = vesafb_remove,
};
module_platform_driver(vesafb_driver);

6
drivers/video/fbdev/vfb.c
View File

@ -79,6 +79,7 @@ static int vfb_mmap(struct fb_info *info,
struct vm_area_struct *vma);
static const struct fb_ops vfb_ops = {
.owner = THIS_MODULE,
.fb_read = fb_sys_read,
.fb_write = fb_sys_write,
.fb_check_var = vfb_check_var,
@ -479,7 +480,7 @@ err:
return retval;
}
static int vfb_remove(struct platform_device *dev)
static void vfb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
@ -489,12 +490,11 @@ static int vfb_remove(struct platform_device *dev)
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
}
return 0;
}
static struct platform_driver vfb_driver = {
.probe = vfb_probe,
.remove = vfb_remove,
.remove_new = vfb_remove,
.driver = {
.name = "vfb",
},

6
drivers/video/fbdev/vga16fb.c
View File

@ -1401,14 +1401,12 @@ static int vga16fb_probe(struct platform_device *dev)
return ret;
}
static int vga16fb_remove(struct platform_device *dev)
static void vga16fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
if (info)
unregister_framebuffer(info);
return 0;
}
static const struct platform_device_id vga16fb_driver_id_table[] = {
@ -1420,7 +1418,7 @@ MODULE_DEVICE_TABLE(platform, vga16fb_driver_id_table);
static struct platform_driver vga16fb_driver = {
.probe = vga16fb_probe,
.remove = vga16fb_remove,
.remove_new = vga16fb_remove,
.driver = {
.name = "vga16fb",
},

5
drivers/video/fbdev/via/via-gpio.c
View File

@ -262,7 +262,7 @@ static int viafb_gpio_probe(struct platform_device *platdev)
}
static int viafb_gpio_remove(struct platform_device *platdev)
static void viafb_gpio_remove(struct platform_device *platdev)
{
unsigned long flags;
int i;
@ -285,7 +285,6 @@ static int viafb_gpio_remove(struct platform_device *platdev)
viafb_gpio_disable(viafb_gpio_config.active_gpios[i]);
viafb_gpio_config.gpio_chip.ngpio = 0;
spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
return 0;
}
static struct platform_driver via_gpio_driver = {
@ -293,7 +292,7 @@ static struct platform_driver via_gpio_driver = {
.name = "viafb-gpio",
},
.probe = viafb_gpio_probe,
.remove = viafb_gpio_remove,
.remove_new = viafb_gpio_remove,
};
int viafb_gpio_init(void)

5
drivers/video/fbdev/via/via_i2c.c
View File

@ -246,7 +246,7 @@ static int viafb_i2c_probe(struct platform_device *platdev)
return 0;
}
static int viafb_i2c_remove(struct platform_device *platdev)
static void viafb_i2c_remove(struct platform_device *platdev)
{
int i;
@ -259,7 +259,6 @@ static int viafb_i2c_remove(struct platform_device *platdev)
if (i2c_stuff->is_active)
i2c_del_adapter(&i2c_stuff->adapter);
}
return 0;
}
static struct platform_driver via_i2c_driver = {
@ -267,7 +266,7 @@ static struct platform_driver via_i2c_driver = {
.name = "viafb-i2c",
},
.probe = viafb_i2c_probe,
.remove = viafb_i2c_remove,
.remove_new = viafb_i2c_remove,
};
int viafb_i2c_init(void)

6
drivers/video/fbdev/vt8500lcdfb.c
View File

@ -439,7 +439,7 @@ failed_free_res:
return ret;
}
static int vt8500lcd_remove(struct platform_device *pdev)
static void vt8500lcd_remove(struct platform_device *pdev)
{
struct vt8500lcd_info *fbi = platform_get_drvdata(pdev);
struct resource *res;
@ -462,8 +462,6 @@ static int vt8500lcd_remove(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res));
return 0;
}
static const struct of_device_id via_dt_ids[] = {
@ -473,7 +471,7 @@ static const struct of_device_id via_dt_ids[] = {
static struct platform_driver vt8500lcd_driver = {
.probe = vt8500lcd_probe,
.remove = vt8500lcd_remove,
.remove_new = vt8500lcd_remove,
.driver = {
.name = "vt8500-lcd",
.of_match_table = of_match_ptr(via_dt_ids),

6
drivers/video/fbdev/wm8505fb.c
View File

@ -372,7 +372,7 @@ static int wm8505fb_probe(struct platform_device *pdev)
return 0;
}
static int wm8505fb_remove(struct platform_device *pdev)
static void wm8505fb_remove(struct platform_device *pdev)
{
struct wm8505fb_info *fbi = platform_get_drvdata(pdev);
@ -382,8 +382,6 @@ static int wm8505fb_remove(struct platform_device *pdev)
if (fbi->fb.cmap.len)
fb_dealloc_cmap(&fbi->fb.cmap);
return 0;
}
static const struct of_device_id wmt_dt_ids[] = {
@ -393,7 +391,7 @@ static const struct of_device_id wmt_dt_ids[] = {
static struct platform_driver wm8505fb_driver = {
.probe = wm8505fb_probe,
.remove = wm8505fb_remove,
.remove_new = wm8505fb_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = wmt_dt_ids,

5
drivers/video/fbdev/wmt_ge_rops.c
View File

@ -145,10 +145,9 @@ static int wmt_ge_rops_probe(struct platform_device *pdev)
return 0;
}
static int wmt_ge_rops_remove(struct platform_device *pdev)
static void wmt_ge_rops_remove(struct platform_device *pdev)
{
iounmap(regbase);
return 0;
}
static const struct of_device_id wmt_dt_ids[] = {
@ -158,7 +157,7 @@ static const struct of_device_id wmt_dt_ids[] = {
static struct platform_driver wmt_ge_rops_driver = {
.probe = wmt_ge_rops_probe,
.remove = wmt_ge_rops_remove,
.remove_new = wmt_ge_rops_remove,
.driver = {
.name = "wmt_ge_rops",
.of_match_table = wmt_dt_ids,

6
drivers/video/fbdev/xilinxfb.c
View File

@ -474,11 +474,9 @@ static int xilinxfb_of_probe(struct platform_device *pdev)
return xilinxfb_assign(pdev, drvdata, &pdata);
}
static int xilinxfb_of_remove(struct platform_device *op)
static void xilinxfb_of_remove(struct platform_device *op)
{
xilinxfb_release(&op->dev);
return 0;
}
/* Match table for of_platform binding */
@ -494,7 +492,7 @@ MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
static struct platform_driver xilinxfb_of_driver = {
.probe = xilinxfb_of_probe,
.remove = xilinxfb_of_remove,
.remove_new = xilinxfb_of_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = xilinxfb_of_match,

2
include/linux/vt_buffer.h
View File

@ -16,7 +16,7 @@
#include <linux/string.h>
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE)
#if IS_ENABLED(CONFIG_VGA_CONSOLE) || IS_ENABLED(CONFIG_MDA_CONSOLE)
#include <asm/vga.h>
#endif