github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 10:41:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ccs: Rename out label of ccs_start_streaming

Browse Source 
In preparation for upcoming changes in the function, rename the out label
as err_pm_put. The purpose of the label is changed to match its name in
the next patch.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Sakari Ailus 2024-04-16 11:12:52 +03:00 committed by Hans Verkuil
parent de927934dd
commit 021baf99c2
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/media/i2c/ccs/ccs-core.c
View File

@ -1761,7 +1761,7 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)
(sensor->csi_format->width << 8) |
sensor->csi_format->compressed);
if (rval)
goto out;
goto err_pm_put;
/* Binning configuration */
if (sensor->binning_horizontal == 1 &&
@ -1774,38 +1774,38 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)
rval = ccs_write(sensor, BINNING_TYPE, binning_type);
if (rval < 0)
goto out;
goto err_pm_put;
binning_mode = 1;
}
rval = ccs_write(sensor, BINNING_MODE, binning_mode);
if (rval < 0)
goto out;
goto err_pm_put;
/* Set up PLL */
rval = ccs_pll_configure(sensor);
if (rval)
goto out;
goto err_pm_put;
/* Analog crop start coordinates */
rval = ccs_write(sensor, X_ADDR_START, sensor->pa_src.left);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, Y_ADDR_START, sensor->pa_src.top);
if (rval < 0)
goto out;
goto err_pm_put;
/* Analog crop end coordinates */
rval = ccs_write(sensor, X_ADDR_END,
sensor->pa_src.left + sensor->pa_src.width - 1);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, Y_ADDR_END,
sensor->pa_src.top + sensor->pa_src.height - 1);
if (rval < 0)
goto out;
goto err_pm_put;
/*
* Output from pixel array, including blanking, is set using
@ -1818,22 +1818,22 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)
rval = ccs_write(sensor, DIGITAL_CROP_X_OFFSET,
sensor->scaler_sink.left);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, DIGITAL_CROP_Y_OFFSET,
sensor->scaler_sink.top);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, DIGITAL_CROP_IMAGE_WIDTH,
sensor->scaler_sink.width);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, DIGITAL_CROP_IMAGE_HEIGHT,
sensor->scaler_sink.height);
if (rval < 0)
goto out;
goto err_pm_put;
}
/* Scaling */
@ -1841,20 +1841,20 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)
!= CCS_SCALING_CAPABILITY_NONE) {
rval = ccs_write(sensor, SCALING_MODE, sensor->scaling_mode);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, SCALE_M, sensor->scale_m);
if (rval < 0)
goto out;
goto err_pm_put;
}
/* Output size from sensor */
rval = ccs_write(sensor, X_OUTPUT_SIZE, sensor->src_src.width);
if (rval < 0)
goto out;
goto err_pm_put;
rval = ccs_write(sensor, Y_OUTPUT_SIZE, sensor->src_src.height);
if (rval < 0)
goto out;
goto err_pm_put;
if (CCS_LIM(sensor, FLASH_MODE_CAPABILITY) &
(CCS_FLASH_MODE_CAPABILITY_SINGLE_STROBE |
@ -1863,18 +1863,18 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)
sensor->hwcfg.strobe_setup->trigger != 0) {
rval = ccs_setup_flash_strobe(sensor);
if (rval)
goto out;
goto err_pm_put;
}
rval = ccs_call_quirk(sensor, pre_streamon);
if (rval) {
dev_err(&client->dev, "pre_streamon quirks failed\n");
goto out;
goto err_pm_put;
}
rval = ccs_write(sensor, MODE_SELECT, CCS_MODE_SELECT_STREAMING);
out:
err_pm_put:
mutex_unlock(&sensor->mutex);
return rval;