Commit b5cab28b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2383ffc4 0650d509

drivers/video/fbdev/amifb.c

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ struct fb_var_cursorinfo { 
	__u16 height;

	__u16 xspot;

	__u16 yspot;

	__u8 data[1];			/* field with [height][width]        */

	DECLARE_FLEX_ARRAY(__u8, data);	/* field with [height][width]        */

};



struct fb_cursorstate {

drivers/video/fbdev/atmel_lcdfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static struct platform_driver atmel_lcdfb_driver = { 
	.resume		= atmel_lcdfb_resume,

	.driver		= {

		.name	= "atmel_lcdfb",

		.of_match_table	= of_match_ptr(atmel_lcdfb_dt_ids),

		.of_match_table	= atmel_lcdfb_dt_ids,

	},

};

drivers/video/fbdev/goldfishfb.c

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ static int goldfish_fb_probe(struct platform_device *pdev) 
	}



	fb->irq = platform_get_irq(pdev, 0);

	if (fb->irq <= 0) {

		ret = -ENODEV;

	if (fb->irq < 0) {

		ret = fb->irq;

		goto err_no_irq;

	}

drivers/video/fbdev/mmp/hw/mmp_ctrl.c

+3 −1
Original line number Diff line number Diff line
@@ -519,7 +519,9 @@ static int mmphw_probe(struct platform_device *pdev) 
			      "unable to get clk %s\n", mi->clk_name);

		goto failed;

	}

	clk_prepare_enable(ctrl->clk);

	ret = clk_prepare_enable(ctrl->clk);

	if (ret)

		goto failed;



	/* init global regs */

	ctrl_set_default(ctrl);

drivers/video/fbdev/ssd1307fb.c

+2 −2
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static int ssd1307fb_init(struct ssd1307fb_par *par) 
		/* Enable the PWM */

		pwm_enable(par->pwm);



		dev_dbg(&par->client->dev, "Using PWM%d with a %lluns period.\n",

			par->pwm->pwm, pwm_get_period(par->pwm));

		dev_dbg(&par->client->dev, "Using PWM %s with a %lluns period.\n",

			par->pwm->label, pwm_get_period(par->pwm));

	}



	/* Set initial contrast */