Commit 5b552b19 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: re-enable warnings again 



For most warnings, the current code is OK. There are still
some issues with implicit-fallthough warnings.

Solve those and re-enable all warnings for this driver.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fb1f6ae6

drivers/staging/media/atomisp/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -344,12 +344,3 @@ DEFINES += -DISP2400 -DSYSTEM_hive_isp_css_2400_system 
endif



ccflags-y += $(INCLUDES) $(DEFINES) -fno-common
 


# HACK! While this driver is in bad shape, don't enable several warnings

#       that would be otherwise enabled with W=1

ccflags-y += $(call cc-disable-warning, implicit-fallthrough)

ccflags-y += $(call cc-disable-warning, missing-prototypes)

ccflags-y += $(call cc-disable-warning, missing-declarations)

ccflags-y += $(call cc-disable-warning, suggest-attribute=format)

ccflags-y += $(call cc-disable-warning, unused-const-variable)

ccflags-y += $(call cc-disable-warning, unused-but-set-variable)

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

+4 −3
Original line number Diff line number Diff line
@@ -4971,9 +4971,10 @@ enum mipi_port_id __get_mipi_port(struct atomisp_device *isp, 
	case ATOMISP_CAMERA_PORT_SECONDARY:

		return MIPI_PORT1_ID;

	case ATOMISP_CAMERA_PORT_TERTIARY:

		if (MIPI_PORT1_ID + 1 != N_MIPI_PORT_ID)

		if (MIPI_PORT1_ID + 1 != N_MIPI_PORT_ID) {

			return MIPI_PORT1_ID + 1;

	/* go through down for else case */

		}

	/* fall through */

	default:

		dev_err(isp->dev, "unsupported port: %d\n", port);

		return MIPI_PORT0_ID;

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

+19 −16
Original line number Diff line number Diff line
@@ -690,22 +690,23 @@ static bool is_pipe_valid_to_current_run_mode(struct atomisp_sub_device *asd, 
	case ATOMISP_RUN_MODE_STILL_CAPTURE:

		if (pipe_id == IA_CSS_PIPE_ID_CAPTURE)

			return true;

		else



		return false;

	case ATOMISP_RUN_MODE_PREVIEW:

		if (!asd->continuous_mode->val) {

			if (pipe_id == IA_CSS_PIPE_ID_PREVIEW)

				return true;

			else



			return false;

		}

	/* fall through to ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE */

	/* fall-through */

	case ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE:

		if (pipe_id == IA_CSS_PIPE_ID_CAPTURE ||

		    pipe_id == IA_CSS_PIPE_ID_PREVIEW)

			return true;

		else



		return false;

	/* fall-through */

	case ATOMISP_RUN_MODE_VIDEO:

		if (!asd->continuous_mode->val) {

			if (pipe_id == IA_CSS_PIPE_ID_VIDEO ||
@@ -714,12 +715,12 @@ static bool is_pipe_valid_to_current_run_mode(struct atomisp_sub_device *asd, 
			else

				return false;

		}

	/* fall through to ATOMISP_RUN_MODE_SDV */

	/* fall through  */

	case ATOMISP_RUN_MODE_SDV:

		if (pipe_id == IA_CSS_PIPE_ID_CAPTURE ||

		    pipe_id == IA_CSS_PIPE_ID_VIDEO)

			return true;

		else



		return false;

	}
@@ -2749,16 +2750,18 @@ static unsigned int atomisp_get_pipe_index(struct atomisp_sub_device *asd, 
		if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO

		    || asd->vfpp->val == ATOMISP_VFPP_DISABLE_SCALER)

			return IA_CSS_PIPE_ID_VIDEO;

		else



		return IA_CSS_PIPE_ID_CAPTURE;

	case ATOMISP_SUBDEV_PAD_SOURCE_CAPTURE:

		if (asd->copy_mode)

			return IA_CSS_PIPE_ID_COPY;



		return IA_CSS_PIPE_ID_CAPTURE;

	case ATOMISP_SUBDEV_PAD_SOURCE_VF:

		if (!atomisp_is_mbuscode_raw(

			asd->fmt[asd->capture_pad].fmt.code))

		if (!atomisp_is_mbuscode_raw(asd->fmt[asd->capture_pad].fmt.code)) {

			return IA_CSS_PIPE_ID_CAPTURE;

		}

		/* fall through */

	case ATOMISP_SUBDEV_PAD_SOURCE_PREVIEW:

		if (asd->yuvpp_mode)

			return IA_CSS_PIPE_ID_YUVPP;
@@ -2766,7 +2769,7 @@ static unsigned int atomisp_get_pipe_index(struct atomisp_sub_device *asd, 
			return IA_CSS_PIPE_ID_COPY;

		if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO)

			return IA_CSS_PIPE_ID_VIDEO;

		else



		return IA_CSS_PIPE_ID_PREVIEW;

	}

	dev_warn(isp->dev,

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

+2 −2
Original line number Diff line number Diff line
@@ -1150,9 +1150,9 @@ static int atomisp_subdev_probe(struct atomisp_device *isp) 


		switch (subdevs->type) {

		case RAW_CAMERA:

			raw_index = isp->input_cnt;

			dev_dbg(isp->dev, "raw_index: %d\n", raw_index);

			/* pass-though */

			raw_index = isp->input_cnt;

			/* fall through */

		case SOC_CAMERA:

			dev_dbg(isp->dev, "SOC_INDEX: %d\n", isp->input_cnt);

			if (isp->input_cnt >= ATOM_ISP_MAX_INPUTS) {

drivers/staging/media/atomisp/pci/hmm/hmm_bo.c

+2 −0
Original line number Diff line number Diff line
@@ -660,6 +660,8 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo, 
				break;

			}



			/* fall through */



		/*

		 * if dynamic memory pool doesn't exist, need to free

		 * pages to system directly.