summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/manager-sysfs.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-09-07 17:44:51 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-26 14:58:31 +0300
commit794bc4eefa10fbc80e6ad29de1bc42424efde608 (patch)
treea9823eb2eae3a2cafed62fedf96db07b45d99e33 /drivers/video/omap2/dss/manager-sysfs.c
parent97f01b3a2ed6d46132bf4e2d237c27846e7b260a (diff)
downloadop-kernel-dev-794bc4eefa10fbc80e6ad29de1bc42424efde608.zip
op-kernel-dev-794bc4eefa10fbc80e6ad29de1bc42424efde608.tar.gz
OMAPDSS: Remove manager->device references
With the introduction of output entities, managers will now connect to outputs. Create helper ops for overlays and managers named get_device. This will abstract away the information on how to get the device from an overlay or an overlay manager. The get_device ops currently retrieve the output via a ovl->manager->device reference. This will be later replaced by ovl->manager->output->device references. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager-sysfs.c')
-rw-r--r--drivers/video/omap2/dss/manager-sysfs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/manager-sysfs.c b/drivers/video/omap2/dss/manager-sysfs.c
index 9b875fb..55cf955 100644
--- a/drivers/video/omap2/dss/manager-sysfs.c
+++ b/drivers/video/omap2/dss/manager-sysfs.c
@@ -38,8 +38,10 @@ static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%s\n",
- mgr->device ? mgr->device->name : "<none>");
+ struct omap_dss_device *dssdev = mgr->get_device(mgr);
+
+ return snprintf(buf, PAGE_SIZE, "%s\n", dssdev ?
+ dssdev->name : "<none>");
}
static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
@@ -67,7 +69,7 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
if (dssdev)
DSSDBG("display %s found\n", dssdev->name);
- if (mgr->device) {
+ if (mgr->get_device(mgr)) {
r = mgr->unset_device(mgr);
if (r) {
DSSERR("failed to unset display\n");
OpenPOWER on IntegriCloud