Hi Sakari,
Thank you for the patch.
On Tue, Apr 16, 2024 at 10:32:53PM +0300, Sakari Ailus wrote:
> 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@xxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/ccs/ccs-core.c | 38 ++++++++++++++++----------------
> 1 file changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
> index d7bc9418eabb..d14e90f8568a 100644
> --- a/drivers/media/i2c/ccs/ccs-core.c
> +++ b/drivers/media/i2c/ccs/ccs-core.c
> @@ -1767,7 +1767,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 &&
> @@ -1780,38 +1780,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
> @@ -1824,22 +1824,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 */
> @@ -1847,20 +1847,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 |
> @@ -1869,18 +1869,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;
--
Regards,
Laurent Pinchart
