Commit 8e3d5d4b authored Sep 23, 2020 by Mauro Carvalho Chehab

media: atomisp: fix gcc warnings

Depending on the gcc version, after changeset
72a9ff3b ("media: atomisp: get rid of -Wsuggest-attribute=format warnings"),
we're now getting two warnings, which are breaking the Jenkins
CI instance at https://builder.linuxtv.org

:

	../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function ‘__set_css_print_env’:
	../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:860:50: error: assignment to ‘int (*)(const char *, char *)’ from incompatible pointer type ‘int (__attribute__((regparm(0))) *)(const char *, char *)’ [-Werror=incompatible-pointer-types]
	   isp->css_env.isp_css_env.print_env.debug_print = vprintk;
	                                                  ^
	../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function ‘atomisp_css_load_firmware’:
	../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:893:49: error: assignment to ‘int (*)(const char *, char *)’ from incompatible pointer type ‘int (__attribute__((regparm(0))) *)(const char *, char *)’ [-Werror=incompatible-pointer-types]
	  isp->css_env.isp_css_env.print_env.error_print = vprintk;
                                                 ^
	cc1: some warnings being treated as errors

So, we need to partially revert the patch.

Fixes: 72a9ff3b ("media: atomisp: get rid of -Wsuggest-attribute=format warnings")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 8d526001

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -166,6 +166,13 @@ atomisp_css2_dbg_ftrace_print(const char *fmt, va_list args)
		return 0;
		}

		static int __attribute__((format (printf, 1, 0)))
		atomisp_vprintk(const char *fmt, va_list args)
		{
		vprintk(fmt, args);
		return 0;
		}

		void atomisp_load_uint32(hrt_address addr, uint32_t *data)
		{
		*data = atomisp_css2_hw_load_32(addr);
		@@ -857,7 +864,7 @@ static inline int __set_css_print_env(struct atomisp_device *isp, int opt)
		isp->css_env.isp_css_env.print_env.debug_print =
		atomisp_css2_dbg_ftrace_print;
		else if (opt == 2)
		isp->css_env.isp_css_env.print_env.debug_print = vprintk;
		isp->css_env.isp_css_env.print_env.debug_print = atomisp_vprintk;
		else
		ret = -EINVAL;

		@@ -890,7 +897,7 @@ int atomisp_css_load_firmware(struct atomisp_device *isp)

		__set_css_print_env(isp, dbg_func);

		isp->css_env.isp_css_env.print_env.error_print = vprintk;
		isp->css_env.isp_css_env.print_env.error_print = atomisp_vprintk;

		/* load isp fw into ISP memory */
		err = ia_css_load_firmware(isp->dev, &isp->css_env.isp_css_env,

Admin message