Commit f65ffcd8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

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

The flag field of the csi_state structure contains the device state.
Rename it accordingly.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Tested-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b0db06bb
...@@ -306,7 +306,7 @@ struct csi_state { ...@@ -306,7 +306,7 @@ struct csi_state {
struct platform_device *pdev; struct platform_device *pdev;
void __iomem *regs; void __iomem *regs;
int irq; int irq;
u32 flags; u32 state;
struct dentry *debugfs_root; struct dentry *debugfs_root;
bool debug; bool debug;
...@@ -812,7 +812,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -812,7 +812,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
mutex_lock(&state->lock); mutex_lock(&state->lock);
if (enable) { if (enable) {
if (state->flags & ST_SUSPENDED) { if (state->state & ST_SUSPENDED) {
ret = -EBUSY; ret = -EBUSY;
goto unlock; goto unlock;
} }
...@@ -824,14 +824,14 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -824,14 +824,14 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
mipi_csis_log_counters(state, true); mipi_csis_log_counters(state, true);
state->flags |= ST_STREAMING; state->state |= ST_STREAMING;
} else { } else {
v4l2_subdev_call(state->src_sd, video, s_stream, 0); v4l2_subdev_call(state->src_sd, video, s_stream, 0);
ret = v4l2_subdev_call(state->src_sd, core, s_power, 0); ret = v4l2_subdev_call(state->src_sd, core, s_power, 0);
if (ret == -ENOIOCTLCMD) if (ret == -ENOIOCTLCMD)
ret = 0; ret = 0;
mipi_csis_stop_stream(state); mipi_csis_stop_stream(state);
state->flags &= ~ST_STREAMING; state->state &= ~ST_STREAMING;
if (state->debug) if (state->debug)
mipi_csis_log_counters(state, true); mipi_csis_log_counters(state, true);
} }
...@@ -1027,7 +1027,7 @@ static int mipi_csis_log_status(struct v4l2_subdev *sd) ...@@ -1027,7 +1027,7 @@ static int mipi_csis_log_status(struct v4l2_subdev *sd)
mutex_lock(&state->lock); mutex_lock(&state->lock);
mipi_csis_log_counters(state, true); 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); mipi_csis_dump_regs(state);
mutex_unlock(&state->lock); mutex_unlock(&state->lock);
...@@ -1177,15 +1177,15 @@ static int mipi_csis_pm_suspend(struct device *dev, bool runtime) ...@@ -1177,15 +1177,15 @@ static int mipi_csis_pm_suspend(struct device *dev, bool runtime)
int ret = 0; int ret = 0;
mutex_lock(&state->lock); mutex_lock(&state->lock);
if (state->flags & ST_POWERED) { if (state->state & ST_POWERED) {
mipi_csis_stop_stream(state); mipi_csis_stop_stream(state);
ret = regulator_disable(state->mipi_phy_regulator); ret = regulator_disable(state->mipi_phy_regulator);
if (ret) if (ret)
goto unlock; goto unlock;
mipi_csis_clk_disable(state); mipi_csis_clk_disable(state);
state->flags &= ~ST_POWERED; state->state &= ~ST_POWERED;
if (!runtime) if (!runtime)
state->flags |= ST_SUSPENDED; state->state |= ST_SUSPENDED;
} }
unlock: unlock:
...@@ -1201,21 +1201,21 @@ static int mipi_csis_pm_resume(struct device *dev, bool runtime) ...@@ -1201,21 +1201,21 @@ static int mipi_csis_pm_resume(struct device *dev, bool runtime)
int ret = 0; int ret = 0;
mutex_lock(&state->lock); mutex_lock(&state->lock);
if (!runtime && !(state->flags & ST_SUSPENDED)) if (!runtime && !(state->state & ST_SUSPENDED))
goto unlock; goto unlock;
if (!(state->flags & ST_POWERED)) { if (!(state->state & ST_POWERED)) {
ret = regulator_enable(state->mipi_phy_regulator); ret = regulator_enable(state->mipi_phy_regulator);
if (ret) if (ret)
goto unlock; goto unlock;
state->flags |= ST_POWERED; state->state |= ST_POWERED;
mipi_csis_clk_enable(state); mipi_csis_clk_enable(state);
} }
if (state->flags & ST_STREAMING) if (state->state & ST_STREAMING)
mipi_csis_start_stream(state); mipi_csis_start_stream(state);
state->flags &= ~ST_SUSPENDED; state->state &= ~ST_SUSPENDED;
unlock: unlock:
mutex_unlock(&state->lock); mutex_unlock(&state->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment