Skip to content

Commit

Permalink
OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n
Browse files Browse the repository at this point in the history
If runtime PM is not enabled in the kernel config, pm_runtime_get_sync()
will always return 1 and pm_runtime_put_sync() will always return
-ENOSYS. pm_runtime_get_sync() returning 1 presents no problem to the
driver, but -ENOSYS from pm_runtime_put_sync() causes the driver to
print a warning.

One option would be to ignore errors returned by pm_runtime_put_sync()
totally, as they only say that the call was unable to put the hardware
into suspend mode.

However, I chose to ignore the returned -ENOSYS explicitly, and print a
warning for other errors, as I think we should get notified if the HW
failed to go to suspend properly.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Tomi Valkeinen authored and Florian Tobias Schandinat committed Jul 8, 2012
1 parent 736f29c commit 373b436
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ void dispc_runtime_put(void)
DSSDBG("dispc_runtime_put\n");

r = pm_runtime_put_sync(&dispc.pdev->dev);
WARN_ON(r < 0);
WARN_ON(r < 0 && r != -ENOSYS);
}

static inline bool dispc_mgr_is_lcd(enum omap_channel channel)
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ void dsi_runtime_put(struct platform_device *dsidev)
DSSDBG("dsi_runtime_put\n");

r = pm_runtime_put_sync(&dsi->pdev->dev);
WARN_ON(r < 0);
WARN_ON(r < 0 && r != -ENOSYS);
}

/* source clock for DSI PLL. this could also be PCLKFREE */
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/dss.c
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ static void dss_runtime_put(void)
DSSDBG("dss_runtime_put\n");

r = pm_runtime_put_sync(&dss.pdev->dev);
WARN_ON(r < 0 && r != -EBUSY);
WARN_ON(r < 0 && r != -ENOSYS && r != -EBUSY);
}

/* DEBUGFS */
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static void hdmi_runtime_put(void)
DSSDBG("hdmi_runtime_put\n");

r = pm_runtime_put_sync(&hdmi.pdev->dev);
WARN_ON(r < 0);
WARN_ON(r < 0 && r != -ENOSYS);
}

static int __init hdmi_init_display(struct omap_dss_device *dssdev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/rfbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static void rfbi_runtime_put(void)
DSSDBG("rfbi_runtime_put\n");

r = pm_runtime_put_sync(&rfbi.pdev->dev);
WARN_ON(r < 0);
WARN_ON(r < 0 && r != -ENOSYS);
}

void rfbi_bus_lock(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ static void venc_runtime_put(void)
DSSDBG("venc_runtime_put\n");

r = pm_runtime_put_sync(&venc.pdev->dev);
WARN_ON(r < 0);
WARN_ON(r < 0 && r != -ENOSYS);
}

static const struct venc_config *venc_timings_to_config(
Expand Down

0 comments on commit 373b436

Please sign in to comment.