Commit 55094932 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/fsl-diu-fb: Output messages with fb_*() helpers 



Fix cases were output helpers are called with struct fb_info.dev.
Use fb_*() helpers instead. Prepares fbdev for making struct
fb_info.dev optional.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Timur Tabi <timur@kernel.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-16-tzimmermann@suse.de
parent f90a0e52

drivers/video/fbdev/fsl-diu-fb.c

+13 −13
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static int map_video_memory(struct fb_info *info) 


	p = alloc_pages_exact(smem_len, GFP_DMA | __GFP_ZERO);

	if (!p) {

		dev_err(info->dev, "unable to allocate fb memory\n");

		fb_err(info, "unable to allocate fb memory\n");

		return -ENOMEM;

	}

	mutex_lock(&info->mm_lock);
@@ -1145,7 +1145,7 @@ static int fsl_diu_set_par(struct fb_info *info) 


		/* Memory allocation for framebuffer */

		if (map_video_memory(info)) {

			dev_err(info->dev, "unable to allocate fb memory 1\n");

			fb_err(info, "unable to allocate fb memory 1\n");

			return -ENOMEM;

		}

	}
@@ -1277,14 +1277,14 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, 
	if (!arg)

		return -EINVAL;



	dev_dbg(info->dev, "ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n", cmd,

	fb_dbg(info, "ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n", cmd,

		_IOC_DIR(cmd) & _IOC_READ ? "R" : "",

		_IOC_DIR(cmd) & _IOC_WRITE ? "W" : "",

		_IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd));



	switch (cmd) {

	case MFB_SET_PIXFMT_OLD:

		dev_warn(info->dev,

		fb_warn(info,

			"MFB_SET_PIXFMT value of 0x%08x is deprecated.\n",

			MFB_SET_PIXFMT_OLD);

		fallthrough;
@@ -1294,7 +1294,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, 
		ad->pix_fmt = pix_fmt;

		break;

	case MFB_GET_PIXFMT_OLD:

		dev_warn(info->dev,

		fb_warn(info,

			"MFB_GET_PIXFMT value of 0x%08x is deprecated.\n",

			MFB_GET_PIXFMT_OLD);

		fallthrough;
@@ -1375,7 +1375,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, 
	}

#endif

	default:

		dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd);

		fb_err(info, "unknown ioctl command (0x%08X)\n", cmd);

		return -ENOIOCTLCMD;

	}
@@ -1543,21 +1543,21 @@ static int install_fb(struct fb_info *info) 
	}



	if (fsl_diu_check_var(&info->var, info)) {

		dev_err(info->dev, "fsl_diu_check_var failed\n");

		fb_err(info, "fsl_diu_check_var failed\n");

		unmap_video_memory(info);

		fb_dealloc_cmap(&info->cmap);

		return -EINVAL;

	}



	if (register_framebuffer(info) < 0) {

		dev_err(info->dev, "register_framebuffer failed\n");

		fb_err(info, "register_framebuffer failed\n");

		unmap_video_memory(info);

		fb_dealloc_cmap(&info->cmap);

		return -EINVAL;

	}



	mfbi->registered = 1;

	dev_info(info->dev, "%s registered successfully\n", mfbi->id);

	fb_info(info, "%s registered successfully\n", mfbi->id);



	return 0;

}