renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-04 11:43:54 +08:00
Code

drm/omap: output: use dev_err instead of DSSERR

Browse Source 
We don't have omapdss's custom error printing functions in the common
omapdss-base module, to which we want to move output.c.

This patch changes output.c to use dev_err instead of DSSERR so that it
doesn't depend on DSSERR.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2015-11-06 15:26:39 +02:00
parent 7c29971629
commit 39637e1003
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/omapdrm/dss/output.c
View File

@ -35,14 +35,15 @@ int omapdss_output_set_device(struct omap_dss_device *out,
mutex_lock(&output_lock); mutex_lock(&output_lock);
if (out->dst) { if (out->dst) {
DSSERR("output already has device %s connected to it\n", dev_err(out->dev,
"output already has device %s connected to it\n",
out->dst->name); out->dst->name);
r = -EINVAL; r = -EINVAL;
goto err; goto err;
} }
if (out->output_type != dssdev->type) { if (out->output_type != dssdev->type) {
DSSERR("output type and display type don't match\n"); dev_err(out->dev, "output type and display type don't match\n");
r = -EINVAL; r = -EINVAL;
goto err; goto err;
} }
@ -67,13 +68,15 @@ int omapdss_output_unset_device(struct omap_dss_device *out)
mutex_lock(&output_lock); mutex_lock(&output_lock);
if (!out->dst) { if (!out->dst) {
DSSERR("output doesn't have a device connected to it\n"); dev_err(out->dev,
"output doesn't have a device connected to it\n");
r = -EINVAL; r = -EINVAL;
goto err; goto err;
} }
if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) { if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
DSSERR("device %s is not disabled, cannot unset device\n", dev_err(out->dev,
"device %s is not disabled, cannot unset device\n",
out->dst->name); out->dst->name);
r = -EINVAL; r = -EINVAL;
goto err; goto err;