summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-12-21 17:57:13 -0800
committerTejun Heo <tj@kernel.org>2012-12-28 13:40:16 -0800
commit7d0315a2bec2dd7fe9cbe31098bb89536648224e (patch)
tree252616dc7d08870a1f32364dd7ea3b1a54ec0f2f
parent7998005bf7a706a1d6bb3cf2e9783b6437e4419d (diff)
downloadtalos-op-linux-7d0315a2bec2dd7fe9cbe31098bb89536648224e.tar.gz
talos-op-linux-7d0315a2bec2dd7fe9cbe31098bb89536648224e.zip
video/exynos: don't use [delayed_]work_pending()
There's no need to test whether a (delayed) work item in pending before queueing, flushing or cancelling it. Most uses are unnecessary and quite a few of them are buggy. Remove unnecessary pending tests from exynos_dp_core. Only compile tested. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Jingoo Han <jg1.han@samsung.com>
-rw-r--r--drivers/video/exynos/exynos_dp_core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 28fd686c6b81..3002a6acce12 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -1121,8 +1121,7 @@ static int __devexit exynos_dp_remove(struct platform_device *pdev)
disable_irq(dp->irq);
- if (work_pending(&dp->hotplug_work))
- flush_work(&dp->hotplug_work);
+ flush_work(&dp->hotplug_work);
if (pdev->dev.of_node) {
if (dp->phy_addr)
@@ -1144,8 +1143,7 @@ static int exynos_dp_suspend(struct device *dev)
struct exynos_dp_platdata *pdata = dev->platform_data;
struct exynos_dp_device *dp = dev_get_drvdata(dev);
- if (work_pending(&dp->hotplug_work))
- flush_work(&dp->hotplug_work);
+ flush_work(&dp->hotplug_work);
if (dev->of_node) {
if (dp->phy_addr)
OpenPOWER on IntegriCloud