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

Pull fbdev fixes and cleanups from Helge Deller:

- various code cleanups in amifb, atmel_lcdfb, ssd1307fb, kyro and
goldfishfb

* tag 'fbdev-for-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: goldfishfb: Do not check 0 for platform_get_irq()
fbdev: atmel_lcdfb: Remove redundant of_match_ptr()
fbdev: kyro: Remove unused declarations
fbdev: ssd1307fb: Print the PWM's label instead of its number
fbdev: mmp: fix value check in mmphw_probe()
fbdev: amifb: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

Changed files
+9 -19
drivers
include
video
+1 -1
drivers/video/fbdev/amifb.c
··· 687 687 __u16 height; 688 688 __u16 xspot; 689 689 __u16 yspot; 690 - __u8 data[1]; /* field with [height][width] */ 690 + DECLARE_FLEX_ARRAY(__u8, data); /* field with [height][width] */ 691 691 }; 692 692 693 693 struct fb_cursorstate {
+1 -1
drivers/video/fbdev/atmel_lcdfb.c
··· 1308 1308 .resume = atmel_lcdfb_resume, 1309 1309 .driver = { 1310 1310 .name = "atmel_lcdfb", 1311 - .of_match_table = of_match_ptr(atmel_lcdfb_dt_ids), 1311 + .of_match_table = atmel_lcdfb_dt_ids, 1312 1312 }, 1313 1313 }; 1314 1314
+2 -2
drivers/video/fbdev/goldfishfb.c
··· 203 203 } 204 204 205 205 fb->irq = platform_get_irq(pdev, 0); 206 - if (fb->irq <= 0) { 207 - ret = -ENODEV; 206 + if (fb->irq < 0) { 207 + ret = fb->irq; 208 208 goto err_no_irq; 209 209 } 210 210
+3 -1
drivers/video/fbdev/mmp/hw/mmp_ctrl.c
··· 519 519 "unable to get clk %s\n", mi->clk_name); 520 520 goto failed; 521 521 } 522 - clk_prepare_enable(ctrl->clk); 522 + ret = clk_prepare_enable(ctrl->clk); 523 + if (ret) 524 + goto failed; 523 525 524 526 /* init global regs */ 525 527 ctrl_set_default(ctrl);
+2 -2
drivers/video/fbdev/ssd1307fb.c
··· 399 399 /* Enable the PWM */ 400 400 pwm_enable(par->pwm); 401 401 402 - dev_dbg(&par->client->dev, "Using PWM%d with a %lluns period.\n", 403 - par->pwm->pwm, pwm_get_period(par->pwm)); 402 + dev_dbg(&par->client->dev, "Using PWM %s with a %lluns period.\n", 403 + par->pwm->label, pwm_get_period(par->pwm)); 404 404 } 405 405 406 406 /* Set initial contrast */
-12
include/video/kyro.h
··· 38 38 int wc_cookie; 39 39 }; 40 40 41 - extern int kyro_dev_init(void); 42 - extern void kyro_dev_reset(void); 43 - 44 - extern unsigned char *kyro_dev_physical_fb_ptr(void); 45 - extern unsigned char *kyro_dev_virtual_fb_ptr(void); 46 - extern void *kyro_dev_physical_regs_ptr(void); 47 - extern void *kyro_dev_virtual_regs_ptr(void); 48 - extern unsigned int kyro_dev_fb_size(void); 49 - extern unsigned int kyro_dev_regs_size(void); 50 - 51 - extern u32 kyro_dev_overlay_offset(void); 52 - 53 41 /* 54 42 * benedict.gaster@superh.com 55 43 * Added the follow IOCTLS for the creation of overlay services...