Skip to content

Commit 725a345

Browse files
torvaldstorvalds
committed
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 ...
2 parents 89555ee + 60ed3cd commit 725a345

61 files changed

Lines changed: 121 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17571,9 +17571,8 @@ F: drivers/block/rbd.c
1757117571
F: drivers/block/rbd_types.h
1757217572

1757317573
RAGE128 FRAMEBUFFER DISPLAY DRIVER
17574-
M: Paul Mackerras <paulus@samba.org>
1757517574
L: linux-fbdev@vger.kernel.org
17576-
S: Maintained
17575+
S: Orphan
1757717576
F: drivers/video/fbdev/aty/aty128fb.c
1757817577

1757917578
RAINSHADOW-CEC DRIVER

‎drivers/video/fbdev/68328fb.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ static int mc68x328fb_pan_display(struct fb_var_screeninfo *var,
9494
static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma);
9595

9696
static const struct fb_ops mc68x328fb_ops = {
97+
.owner = THIS_MODULE,
9798
.fb_check_var = mc68x328fb_check_var,
9899
.fb_set_par = mc68x328fb_set_par,
99100
.fb_setcolreg = mc68x328fb_setcolreg,

‎drivers/video/fbdev/cg14.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static int cg14_probe(struct platform_device *op)
569569
return err;
570570
}
571571

572-
static int cg14_remove(struct platform_device *op)
572+
static void cg14_remove(struct platform_device *op)
573573
{
574574
struct fb_info *info = dev_get_drvdata(&op->dev);
575575
struct cg14_par *par = info->par;
@@ -580,8 +580,6 @@ static int cg14_remove(struct platform_device *op)
580580
cg14_unmap_regs(op, info, par);
581581

582582
framebuffer_release(info);
583-
584-
return 0;
585583
}
586584

587585
static const struct of_device_id cg14_match[] = {
@@ -598,7 +596,7 @@ static struct platform_driver cg14_driver = {
598596
.of_match_table = cg14_match,
599597
},
600598
.probe = cg14_probe,
601-
.remove = cg14_remove,
599+
.remove_new = cg14_remove,
602600
};
603601

604602
static int __init cg14_init(void)

‎drivers/video/fbdev/cg3.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static int cg3_probe(struct platform_device *op)
434434
return err;
435435
}
436436

437-
static int cg3_remove(struct platform_device *op)
437+
static void cg3_remove(struct platform_device *op)
438438
{
439439
struct fb_info *info = dev_get_drvdata(&op->dev);
440440
struct cg3_par *par = info->par;
@@ -446,8 +446,6 @@ static int cg3_remove(struct platform_device *op)
446446
of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
447447

448448
framebuffer_release(info);
449-
450-
return 0;
451449
}
452450

453451
static const struct of_device_id cg3_match[] = {
@@ -467,7 +465,7 @@ static struct platform_driver cg3_driver = {
467465
.of_match_table = cg3_match,
468466
},
469467
.probe = cg3_probe,
470-
.remove = cg3_remove,
468+
.remove_new = cg3_remove,
471469
};
472470

473471
static int __init cg3_init(void)

‎drivers/video/fbdev/cg6.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ static int cg6_probe(struct platform_device *op)
828828
return err;
829829
}
830830

831-
static int cg6_remove(struct platform_device *op)
831+
static void cg6_remove(struct platform_device *op)
832832
{
833833
struct fb_info *info = dev_get_drvdata(&op->dev);
834834
struct cg6_par *par = info->par;
@@ -839,8 +839,6 @@ static int cg6_remove(struct platform_device *op)
839839
cg6_unmap_regs(op, info, par);
840840

841841
framebuffer_release(info);
842-
843-
return 0;
844842
}
845843

846844
static const struct of_device_id cg6_match[] = {
@@ -860,7 +858,7 @@ static struct platform_driver cg6_driver = {
860858
.of_match_table = cg6_match,
861859
},
862860
.probe = cg6_probe,
863-
.remove = cg6_remove,
861+
.remove_new = cg6_remove,
864862
};
865863

866864
static int __init cg6_init(void)

‎drivers/video/fbdev/clps711x-fb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ static int clps711x_fb_probe(struct platform_device *pdev)
350350
return ret;
351351
}
352352

353-
static int clps711x_fb_remove(struct platform_device *pdev)
353+
static void clps711x_fb_remove(struct platform_device *pdev)
354354
{
355355
struct fb_info *info = platform_get_drvdata(pdev);
356356
struct clps711x_fb_info *cfb = info->par;
@@ -360,8 +360,6 @@ static int clps711x_fb_remove(struct platform_device *pdev)
360360
unregister_framebuffer(info);
361361
fb_dealloc_cmap(&info->cmap);
362362
framebuffer_release(info);
363-
364-
return 0;
365363
}
366364

367365
static const struct of_device_id clps711x_fb_dt_ids[] = {
@@ -376,7 +374,7 @@ static struct platform_driver clps711x_fb_driver = {
376374
.of_match_table = clps711x_fb_dt_ids,
377375
},
378376
.probe = clps711x_fb_probe,
379-
.remove = clps711x_fb_remove,
377+
.remove_new = clps711x_fb_remove,
380378
};
381379
module_platform_driver(clps711x_fb_driver);
382380

‎drivers/video/fbdev/cobalt_lcdfb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static int cobalt_lcdfb_probe(struct platform_device *dev)
324324
return 0;
325325
}
326326

327-
static int cobalt_lcdfb_remove(struct platform_device *dev)
327+
static void cobalt_lcdfb_remove(struct platform_device *dev)
328328
{
329329
struct fb_info *info;
330330

@@ -333,13 +333,11 @@ static int cobalt_lcdfb_remove(struct platform_device *dev)
333333
unregister_framebuffer(info);
334334
framebuffer_release(info);
335335
}
336-
337-
return 0;
338336
}
339337

340338
static struct platform_driver cobalt_lcdfb_driver = {
341339
.probe = cobalt_lcdfb_probe,
342-
.remove = cobalt_lcdfb_remove,
340+
.remove_new = cobalt_lcdfb_remove,
343341
.driver = {
344342
.name = "cobalt-lcd",
345343
},

‎drivers/video/fbdev/da8xx-fb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ static void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
10641064
}
10651065
#endif
10661066

1067-
static int fb_remove(struct platform_device *dev)
1067+
static void fb_remove(struct platform_device *dev)
10681068
{
10691069
struct fb_info *info = platform_get_drvdata(dev);
10701070
struct da8xx_fb_par *par = info->par;
@@ -1091,8 +1091,6 @@ static int fb_remove(struct platform_device *dev)
10911091
pm_runtime_put_sync(&dev->dev);
10921092
pm_runtime_disable(&dev->dev);
10931093
framebuffer_release(info);
1094-
1095-
return 0;
10961094
}
10971095

10981096
/*
@@ -1657,7 +1655,7 @@ static SIMPLE_DEV_PM_OPS(fb_pm_ops, fb_suspend, fb_resume);
16571655

16581656
static struct platform_driver da8xx_fb_driver = {
16591657
.probe = fb_probe,
1660-
.remove = fb_remove,
1658+
.remove_new = fb_remove,
16611659
.driver = {
16621660
.name = DRIVER_NAME,
16631661
.pm = &fb_pm_ops,

‎drivers/video/fbdev/efifb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,23 +621,21 @@ static int efifb_probe(struct platform_device *dev)
621621
return err;
622622
}
623623

624-
static int efifb_remove(struct platform_device *pdev)
624+
static void efifb_remove(struct platform_device *pdev)
625625
{
626626
struct fb_info *info = platform_get_drvdata(pdev);
627627

628628
/* efifb_destroy takes care of info cleanup */
629629
unregister_framebuffer(info);
630630
sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
631-
632-
return 0;
633631
}
634632

635633
static struct platform_driver efifb_driver = {
636634
.driver = {
637635
.name = "efi-framebuffer",
638636
},
639637
.probe = efifb_probe,
640-
.remove = efifb_remove,
638+
.remove_new = efifb_remove,
641639
};
642640

643641
builtin_platform_driver(efifb_driver);

‎drivers/video/fbdev/ep93xx-fb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static int ep93xxfb_probe(struct platform_device *pdev)
573573
return err;
574574
}
575575

576-
static int ep93xxfb_remove(struct platform_device *pdev)
576+
static void ep93xxfb_remove(struct platform_device *pdev)
577577
{
578578
struct fb_info *info = platform_get_drvdata(pdev);
579579
struct ep93xx_fbi *fbi = info->par;
@@ -587,13 +587,11 @@ static int ep93xxfb_remove(struct platform_device *pdev)
587587
fbi->mach_info->teardown(pdev);
588588

589589
kfree(info);
590-
591-
return 0;
592590
}
593591

594592
static struct platform_driver ep93xxfb_driver = {
595593
.probe = ep93xxfb_probe,
596-
.remove = ep93xxfb_remove,
594+
.remove_new = ep93xxfb_remove,
597595
.driver = {
598596
.name = "ep93xx-fb",
599597
},

0 commit comments

Comments
 (0)