Commit 6fb5d718 authored by Tsuchiya Yuto's avatar Tsuchiya Yuto Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: use IA_CSS_ERROR() for error messages in sh_css_mipi.c 



Some debug messages for error cases (messages contain "error: ") use
IA_CSS_DEBUG_TRACE_PRIVATE debug level. This causes these error messages
not to appear unless users raise debug output level to 7 or higher (using
module parameter, dbg_level=7).

So, use IA_CSS_DEBUG_ERROR debug level (dbg_level=1) instead considering
that these are error messages. There is already a macro IA_CSS_ERROR()
for this use case. Let's use it. It automatically appends "error: " at
the beginning and a newline to a message. Therefore, we can remove them
from these messages.

While here, remove the unnecessary newline from one IA_CSS_ERROR()
occurrence in the same file.

Signed-off-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d21ce8c2

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

+13 −19
Original line number Diff line number Diff line
@@ -434,8 +434,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, 


	if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||

	    (IS_ISP2401 && err)) {

		ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

				    "allocate_mipi_frames(%p) exit: error: port is not correct (port=%d).\n",

		IA_CSS_ERROR("allocate_mipi_frames(%p) exit: port is not correct (port=%d).",

			     pipe, port);

		return -EINVAL;

	}
@@ -497,8 +496,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, 
							my_css.mipi_frames[port][j] = NULL;

						}

					}

					ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

							    "allocate_mipi_frames(%p, %d) exit: error: allocation failed.\n",

					IA_CSS_ERROR("allocate_mipi_frames(%p, %d) exit: allocation failed.",

						     pipe, port);

					return err;

				}
@@ -542,15 +540,13 @@ free_mipi_frames(struct ia_css_pipe *pipe) 
	if (pipe) {

		assert(pipe->stream);

		if ((!pipe) || (!pipe->stream)) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

					    "free_mipi_frames(%p) exit: error: pipe or stream is null.\n",

			IA_CSS_ERROR("free_mipi_frames(%p) exit: pipe or stream is null.",

				     pipe);

			return -EINVAL;

		}



		if (!buffers_needed(pipe)) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

					    "free_mipi_frames(%p) exit: error: wrong mode.\n",

			IA_CSS_ERROR("free_mipi_frames(%p) exit: wrong mode.",

				     pipe);

			return err;

		}
@@ -566,8 +562,7 @@ free_mipi_frames(struct ia_css_pipe *pipe) 


		if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||

		    (IS_ISP2401 && err)) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

					    "free_mipi_frames(%p, %d) exit: error: pipe port is not correct.\n",

			IA_CSS_ERROR("free_mipi_frames(%p, %d) exit: pipe port is not correct.",

				     pipe, port);

			return err;

		}
@@ -576,8 +571,7 @@ free_mipi_frames(struct ia_css_pipe *pipe) 
#if !defined(ISP2401)

			assert(ref_count_mipi_allocation[port] == 1);

			if (ref_count_mipi_allocation[port] != 1) {

				ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

						    "free_mipi_frames(%p) exit: error: wrong ref_count (ref_count=%d).\n",

				IA_CSS_ERROR("free_mipi_frames(%p) exit: wrong ref_count (ref_count=%d).",

					     pipe, ref_count_mipi_allocation[port]);

				return err;

			}
@@ -680,7 +674,7 @@ send_mipi_frames(struct ia_css_pipe *pipe) 


	if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||

	    (IS_ISP2401 && err)) {

		IA_CSS_ERROR("send_mipi_frames(%p) exit: invalid port specified (port=%d).\n",

		IA_CSS_ERROR("send_mipi_frames(%p) exit: invalid port specified (port=%d).",

			     pipe, port);

		return err;

	}