mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 13:23:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: imx: imx7_mipi_csis: Rename csi_state flag field to state

Browse Source 
The flag field of the csi_state structure contains the device state.
Rename it accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart
2021-04-13 04:30:04 +02:00
committed by Mauro Carvalho Chehab
parent b0db06bb98
commit f65ffcd8ab
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/media/imx/imx7-mipi-csis.c
View File

@@ -306,7 +306,7 @@ struct csi_state {
struct platform_device *pdev;
void __iomem *regs;
int irq;
u32 flags;
u32 state;
struct dentry *debugfs_root;
bool debug;
@@ -812,7 +812,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
mutex_lock(&state->lock);
if (enable) {
if (state->flags & ST_SUSPENDED) {
if (state->state & ST_SUSPENDED) {
ret = -EBUSY;
goto unlock;
}
@@ -824,14 +824,14 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
mipi_csis_log_counters(state, true);
state->flags |= ST_STREAMING;
state->state |= ST_STREAMING;
} else {
v4l2_subdev_call(state->src_sd, video, s_stream, 0);
ret = v4l2_subdev_call(state->src_sd, core, s_power, 0);
if (ret == -ENOIOCTLCMD)
ret = 0;
mipi_csis_stop_stream(state);
state->flags &= ~ST_STREAMING;
state->state &= ~ST_STREAMING;
if (state->debug)
mipi_csis_log_counters(state, true);
}
@@ -1027,7 +1027,7 @@ static int mipi_csis_log_status(struct v4l2_subdev *sd)
mutex_lock(&state->lock);
mipi_csis_log_counters(state, true);
if (state->debug && (state->flags & ST_POWERED))
if (state->debug && (state->state & ST_POWERED))
mipi_csis_dump_regs(state);
mutex_unlock(&state->lock);
@@ -1177,15 +1177,15 @@ static int mipi_csis_pm_suspend(struct device *dev, bool runtime)
int ret = 0;
mutex_lock(&state->lock);
if (state->flags & ST_POWERED) {
if (state->state & ST_POWERED) {
mipi_csis_stop_stream(state);
ret = regulator_disable(state->mipi_phy_regulator);
if (ret)
goto unlock;
mipi_csis_clk_disable(state);
state->flags &= ~ST_POWERED;
state->state &= ~ST_POWERED;
if (!runtime)
state->flags |= ST_SUSPENDED;
state->state |= ST_SUSPENDED;
}
unlock:
@@ -1201,21 +1201,21 @@ static int mipi_csis_pm_resume(struct device *dev, bool runtime)
int ret = 0;
mutex_lock(&state->lock);
if (!runtime && !(state->flags & ST_SUSPENDED))
if (!runtime && !(state->state & ST_SUSPENDED))
goto unlock;
if (!(state->flags & ST_POWERED)) {
if (!(state->state & ST_POWERED)) {
ret = regulator_enable(state->mipi_phy_regulator);
if (ret)
goto unlock;
state->flags |= ST_POWERED;
state->state |= ST_POWERED;
mipi_csis_clk_enable(state);
}
if (state->flags & ST_STREAMING)
if (state->state & ST_STREAMING)
mipi_csis_start_stream(state);
state->flags &= ~ST_SUSPENDED;
state->state &= ~ST_SUSPENDED;
unlock:
mutex_unlock(&state->lock);