Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 796e2f41 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: s3c-fb: fix sparse warnings about using incorrect types 



Use ->screen_buffer instead of ->screen_base to fix sparse warnings.

[ Please see commit 17a7b0b4 ("fb.h: Provide alternate screen_base
  pointer") for details. ]

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 0adcdbcb

drivers/video/fbdev/s3c-fb.c

+6 −6
Original line number Diff line number Diff line
@@ -1105,14 +1105,14 @@ static int s3c_fb_alloc_memory(struct s3c_fb *sfb, struct s3c_fb_win *win) 


	dev_dbg(sfb->dev, "want %u bytes for window\n", size);



	fbi->screen_base = dma_alloc_wc(sfb->dev, size, &map_dma, GFP_KERNEL);

	if (!fbi->screen_base)

	fbi->screen_buffer = dma_alloc_wc(sfb->dev, size, &map_dma, GFP_KERNEL);

	if (!fbi->screen_buffer)

		return -ENOMEM;



	dev_dbg(sfb->dev, "mapped %x to %p\n",

		(unsigned int)map_dma, fbi->screen_base);

		(unsigned int)map_dma, fbi->screen_buffer);



	memset(fbi->screen_base, 0x0, size);

	memset(fbi->screen_buffer, 0x0, size);

	fbi->fix.smem_start = map_dma;



	return 0;
@@ -1129,9 +1129,9 @@ static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win) 
{

	struct fb_info *fbi = win->fbinfo;



	if (fbi->screen_base)

	if (fbi->screen_buffer)

		dma_free_wc(sfb->dev, PAGE_ALIGN(fbi->fix.smem_len),

		            fbi->screen_base, fbi->fix.smem_start);

			    fbi->screen_buffer, fbi->fix.smem_start);

}



/**