aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/display.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/dss/display.c')
-rw-r--r--drivers/video/omap2/dss/display.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 86996d8d65be..29ec5a4a46bc 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -53,11 +53,11 @@ static ssize_t display_enabled_store(struct device *dev,
53 53
54 if (enabled != (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)) { 54 if (enabled != (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)) {
55 if (enabled) { 55 if (enabled) {
56 r = dssdev->enable(dssdev); 56 r = dssdev->driver->enable(dssdev);
57 if (r) 57 if (r)
58 return r; 58 return r;
59 } else { 59 } else {
60 dssdev->disable(dssdev); 60 dssdev->driver->disable(dssdev);
61 } 61 }
62 } 62 }
63 63
@@ -485,13 +485,13 @@ static int dss_suspend_device(struct device *dev, void *data)
485 return 0; 485 return 0;
486 } 486 }
487 487
488 if (!dssdev->suspend) { 488 if (!dssdev->driver->suspend) {
489 DSSERR("display '%s' doesn't implement suspend\n", 489 DSSERR("display '%s' doesn't implement suspend\n",
490 dssdev->name); 490 dssdev->name);
491 return -ENOSYS; 491 return -ENOSYS;
492 } 492 }
493 493
494 r = dssdev->suspend(dssdev); 494 r = dssdev->driver->suspend(dssdev);
495 if (r) 495 if (r)
496 return r; 496 return r;
497 497
@@ -520,8 +520,8 @@ static int dss_resume_device(struct device *dev, void *data)
520 int r; 520 int r;
521 struct omap_dss_device *dssdev = to_dss_device(dev); 521 struct omap_dss_device *dssdev = to_dss_device(dev);
522 522
523 if (dssdev->activate_after_resume && dssdev->resume) { 523 if (dssdev->activate_after_resume && dssdev->driver->resume) {
524 r = dssdev->resume(dssdev); 524 r = dssdev->driver->resume(dssdev);
525 if (r) 525 if (r)
526 return r; 526 return r;
527 } 527 }
@@ -541,7 +541,7 @@ int dss_resume_all_devices(void)
541static int dss_disable_device(struct device *dev, void *data) 541static int dss_disable_device(struct device *dev, void *data)
542{ 542{
543 struct omap_dss_device *dssdev = to_dss_device(dev); 543 struct omap_dss_device *dssdev = to_dss_device(dev);
544 dssdev->disable(dssdev); 544 dssdev->driver->disable(dssdev);
545 return 0; 545 return 0;
546} 546}
547 547