Commit e273454c authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: imx: imx-mipi-csis: Drop powered flag 



The mipi_csis_device.powered flag only serves for the purpose of
not accessing registers in mipi_csis_log_status() when the interface
is not powered up.

Instead of manually tracking the power state, rely on
pm_runtime_get_if_in_use() to remove the 'powered' flag. Also remove
the locking in the function as runtime_pm() is refcounted and there's no
risk of the interface being powered down behind our backs.

Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent df4167d9

drivers/media/platform/nxp/imx-mipi-csis.c

+4 −9
Original line number Diff line number Diff line
@@ -322,10 +322,9 @@ struct mipi_csis_device { 
	u32 hs_settle;

	u32 clk_settle;



	struct mutex lock;	/* Protect csis_fmt, format_mbus and powered */

	struct mutex lock;	/* Protect csis_fmt and format_mbus */

	const struct csis_pix_format *csis_fmt;

	struct v4l2_mbus_framefmt format_mbus[CSIS_PADS_NUM];

	bool powered;



	spinlock_t slock;	/* Protect events */

	struct mipi_csis_event events[MIPI_CSIS_NUM_EVENTS];
@@ -1163,11 +1162,11 @@ static int mipi_csis_log_status(struct v4l2_subdev *sd) 
{

	struct mipi_csis_device *csis = sd_to_mipi_csis_device(sd);



	mutex_lock(&csis->lock);

	mipi_csis_log_counters(csis, true);

	if (csis->debug.enable && csis->powered)

	if (csis->debug.enable && pm_runtime_get_if_in_use(csis->dev)) {

		mipi_csis_dump_regs(csis);

	mutex_unlock(&csis->lock);

		pm_runtime_put(csis->dev);

	}



	return 0;

}
@@ -1332,8 +1331,6 @@ static int __maybe_unused mipi_csis_runtime_suspend(struct device *dev) 


	mipi_csis_clk_disable(csis);



	csis->powered = false;



unlock:

	mutex_unlock(&csis->lock);
@@ -1354,8 +1351,6 @@ static int __maybe_unused mipi_csis_runtime_resume(struct device *dev) 


	mipi_csis_clk_enable(csis);



	csis->powered = true;



unlock:

	mutex_unlock(&csis->lock);