Merge tag 'v5.9-rc4' into patchwork

[linux-2.6-block.git] / drivers / staging / media / atomisp / pci / atomisp_compat_css20.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 1b2b2c68025b4cc6643c40942925cc8948c69a71..a78c53251346938ec9e69ff49d6292eab5befc1e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -159,24 +159,13 @@ static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n)
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
-static int atomisp_css2_dbg_print(const char *fmt, va_list args)
-{
-       vprintk(fmt, args);
-       return 0;
-}
-
-static int atomisp_css2_dbg_ftrace_print(const char *fmt, va_list args)
+static int  __attribute__((format (printf, 1, 0)))
+atomisp_css2_dbg_ftrace_print(const char *fmt, va_list args)
 {
        ftrace_vprintk(fmt, args);
        return 0;
 }
 
-static int atomisp_css2_err_print(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);
@@ -869,8 +858,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 =
-                   atomisp_css2_dbg_print;
+               isp->css_env.isp_css_env.print_env.debug_print = vprintk;
        else
                ret = -EINVAL;
 
@@ -903,7 +891,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 = atomisp_css2_err_print;
+       isp->css_env.isp_css_env.print_env.error_print = vprintk;
 
        /* load isp fw into ISP memory */
        err = ia_css_load_firmware(isp->dev, &isp->css_env.isp_css_env,