Commit 06dc10ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes and cleanups from Helge Deller:
 "Various minor fixes, cleanups and annotations for atyfb, sa1100fb,
  omapfb, uvesafb and mmp"

* tag 'fbdev-for-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: core: syscopyarea: fix sloppy typing
  fbdev: core: cfbcopyarea: fix sloppy typing
  fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit()
  fbdev: uvesafb: Remove uvesafb_exec() prototype from include/video/uvesafb.h
  fbdev: sa1100fb: mark sa1100fb_init() static
  fbdev: omapfb: fix some error codes
  fbdev: atyfb: only use ioremap_uc() on i386 and ia64
  fbdev: mmp: Annotate struct mmp_path with __counted_by
  fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
parents 213f8915 e8e4a470

drivers/video/fbdev/aty/atyfb_base.c

+4 −0
Original line number Diff line number Diff line
@@ -3440,11 +3440,15 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, 
	}



	info->fix.mmio_start = raddr;

#if defined(__i386__) || defined(__ia64__)

	/*

	 * By using strong UC we force the MTRR to never have an

	 * effect on the MMIO region on both non-PAT and PAT systems.

	 */

	par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000);

#else

	par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000);

#endif

	if (par->ati_regbase == NULL)

		return -ENOMEM;

drivers/video/fbdev/core/cfbcopyarea.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ void cfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) 
{

	u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;

	u32 height = area->height, width = area->width;

	unsigned long const bits_per_line = p->fix.line_length*8u;

	unsigned int const bits_per_line = p->fix.line_length * 8u;

	unsigned long __iomem *base = NULL;

	int bits = BITS_PER_LONG, bytes = bits >> 3;

	unsigned dst_idx = 0, src_idx = 0, rev_copy = 0;

drivers/video/fbdev/core/syscopyarea.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area) 
{

	u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;

	u32 height = area->height, width = area->width;

	unsigned long const bits_per_line = p->fix.line_length*8u;

	unsigned int const bits_per_line = p->fix.line_length * 8u;

	unsigned long *base = NULL;

	int bits = BITS_PER_LONG, bytes = bits >> 3;

	unsigned dst_idx = 0, src_idx = 0, rev_copy = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ struct mmphw_ctrl { 


	/*pathes*/

	int path_num;

	struct mmphw_path_plat path_plats[];

	struct mmphw_path_plat path_plats[] __counted_by(path_num);

};



static inline int overlay_is_vid(struct mmp_overlay *overlay)

drivers/video/fbdev/omap/omapfb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1645,13 +1645,13 @@ static int omapfb_do_probe(struct platform_device *pdev, 
	}

	fbdev->int_irq = platform_get_irq(pdev, 0);

	if (fbdev->int_irq < 0) {

		r = ENXIO;

		r = -ENXIO;

		goto cleanup;

	}



	fbdev->ext_irq = platform_get_irq(pdev, 1);

	if (fbdev->ext_irq < 0) {

		r = ENXIO;

		r = -ENXIO;

		goto cleanup;

	}