mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
media: ti: j721e-csi2rx: Minor cleanup of loop variables
Replace open-coded `i--; for (; i >= 0; i--)` patterns with the idiomatic `while (i--)` in the error unwind paths of csi_async_notifier_complete() and ti_csi2rx_probe(). Also scope loop variables directly in the for statement instead of declaring them at the top of the function in ti_csi2rx_suspend(), ti_csi2rx_resume() and ti_csi2rx_remove(). Change the type to unsigned int in the first two to match csi->num_ctx. Signed-off-by: Rishikesh Donadkar <r-donadkar@ti.com> Reviewed-by: Jai Luthra <jai.luthra@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
parent
c6b1b34b50
commit
6767653b4e
|
|
@ -485,8 +485,7 @@ static int csi_async_notifier_complete(struct v4l2_async_notifier *notifier)
|
|||
return 0;
|
||||
|
||||
unregister_dev:
|
||||
i--;
|
||||
for (; i >= 0; i--) {
|
||||
while (i--) {
|
||||
media_entity_remove_links(&csi->ctx[i].vdev.entity);
|
||||
video_unregister_device(&csi->ctx[i].vdev);
|
||||
}
|
||||
|
|
@ -1552,7 +1551,7 @@ static int ti_csi2rx_suspend(struct device *dev)
|
|||
struct ti_csi2rx_ctx *ctx;
|
||||
struct ti_csi2rx_dma *dma;
|
||||
unsigned long flags = 0;
|
||||
int i, ret = 0;
|
||||
int ret = 0;
|
||||
|
||||
/* If device was not in use we can simply suspend */
|
||||
if (pm_runtime_status_suspended(dev))
|
||||
|
|
@ -1564,7 +1563,7 @@ static int ti_csi2rx_suspend(struct device *dev)
|
|||
*/
|
||||
writel(0, csi->shim + SHIM_CNTL);
|
||||
|
||||
for (i = 0; i < csi->num_ctx; i++) {
|
||||
for (unsigned int i = 0; i < csi->num_ctx; i++) {
|
||||
ctx = &csi->ctx[i];
|
||||
dma = &ctx->dma;
|
||||
|
||||
|
|
@ -1604,7 +1603,7 @@ static int ti_csi2rx_resume(struct device *dev)
|
|||
struct ti_csi2rx_buffer *buf;
|
||||
unsigned long flags = 0;
|
||||
unsigned int reg;
|
||||
int i, ret = 0;
|
||||
int ret = 0;
|
||||
|
||||
/* If device was not in use, we can simply wakeup */
|
||||
if (pm_runtime_status_suspended(dev))
|
||||
|
|
@ -1614,7 +1613,7 @@ static int ti_csi2rx_resume(struct device *dev)
|
|||
reg = SHIM_CNTL_PIX_RST;
|
||||
writel(reg, csi->shim + SHIM_CNTL);
|
||||
|
||||
for (i = 0; i < csi->num_ctx; i++) {
|
||||
for (unsigned int i = 0; i < csi->num_ctx; i++) {
|
||||
ctx = &csi->ctx[i];
|
||||
dma = &ctx->dma;
|
||||
spin_lock_irqsave(&dma->lock, flags);
|
||||
|
|
@ -1755,8 +1754,7 @@ static int ti_csi2rx_probe(struct platform_device *pdev)
|
|||
err_notifier:
|
||||
ti_csi2rx_cleanup_notifier(csi);
|
||||
err_ctx:
|
||||
i--;
|
||||
for (; i >= 0; i--)
|
||||
while (i--)
|
||||
ti_csi2rx_cleanup_ctx(&csi->ctx[i]);
|
||||
ti_csi2rx_cleanup_v4l2(csi);
|
||||
err_dma_chan:
|
||||
|
|
@ -1768,12 +1766,11 @@ static int ti_csi2rx_probe(struct platform_device *pdev)
|
|||
static void ti_csi2rx_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ti_csi2rx_dev *csi = platform_get_drvdata(pdev);
|
||||
unsigned int i;
|
||||
|
||||
if (!pm_runtime_status_suspended(&pdev->dev))
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
|
||||
for (i = 0; i < csi->num_ctx; i++)
|
||||
for (unsigned int i = 0; i < csi->num_ctx; i++)
|
||||
ti_csi2rx_cleanup_ctx(&csi->ctx[i]);
|
||||
|
||||
ti_csi2rx_cleanup_notifier(csi);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user