iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: imx: imx-mipi-csis: Don't use .s_power()

Browse Source 
The subdev .s_power() operation is deprecated. Drop it, requiring sensor
drivers to correctly use runtime PM instead of relying on .s_power().

As this driver has just been moved out of staging, and necessary drivers
to implement a full camera pipeline are still in staging, no platform
depends yet on this API being called. There is thus no risk of
regression.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Laurent Pinchart 2022-03-11 13:29:03 +00:00 committed by Mauro Carvalho Chehab
parent c1cc03eafd
commit 284dd84878
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/platform/nxp/imx-mipi-csis.c
View File

@ -932,7 +932,7 @@ static struct mipi_csis_device *sd_to_mipi_csis_device(struct v4l2_subdev *sdev)
static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
{
struct mipi_csis_device *csis = sd_to_mipi_csis_device(sd);
int ret;
int ret = 0;
if (enable) {
ret = mipi_csis_calculate_params(csis);
@ -944,10 +944,6 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
ret = pm_runtime_resume_and_get(csis->dev);
if (ret < 0)
return ret;
ret = v4l2_subdev_call(csis->src_sd, core, s_power, 1);
if (ret < 0 && ret != -ENOIOCTLCMD)
goto done;
}
mutex_lock(&csis->lock);
@ -968,9 +964,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
csis->state |= ST_STREAMING;
} else {
v4l2_subdev_call(csis->src_sd, video, s_stream, 0);
ret = v4l2_subdev_call(csis->src_sd, core, s_power, 0);
if (ret == -ENOIOCTLCMD)
ret = 0;
mipi_csis_stop_stream(csis);
csis->state &= ~ST_STREAMING;
if (csis->debug.enable)
@ -980,7 +974,6 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
unlock:
mutex_unlock(&csis->lock);
done:
if (!enable || ret < 0)
pm_runtime_put(csis->dev);