aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-11-06 08:26:39 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2017-04-03 05:36:40 -0400
commit39637e10032a15dc56abef1846d5be47698be1bb (patch)
treef763a1d7b197ab756a852be98c3a0ae9c8042e1c
parent7c299716297c9a90b31d1f627f003a0de9c48318 (diff)
drm/omap: output: use dev_err instead of DSSERR
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>
-rw-r--r--drivers/gpu/drm/omapdrm/dss/output.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index a901af5a9bc3..0858958677a1 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -35,14 +35,15 @@ int omapdss_output_set_device(struct omap_dss_device *out,
35 mutex_lock(&output_lock); 35 mutex_lock(&output_lock);
36 36
37 if (out->dst) { 37 if (out->dst) {
38 DSSERR("output already has device %s connected to it\n", 38 dev_err(out->dev,
39 "output already has device %s connected to it\n",
39 out->dst->name); 40 out->dst->name);
40 r = -EINVAL; 41 r = -EINVAL;
41 goto err; 42 goto err;
42 } 43 }
43 44
44 if (out->output_type != dssdev->type) { 45 if (out->output_type != dssdev->type) {
45 DSSERR("output type and display type don't match\n"); 46 dev_err(out->dev, "output type and display type don't match\n");
46 r = -EINVAL; 47 r = -EINVAL;
47 goto err; 48 goto err;
48 } 49 }
@@ -67,14 +68,16 @@ int omapdss_output_unset_device(struct omap_dss_device *out)
67 mutex_lock(&output_lock); 68 mutex_lock(&output_lock);
68 69
69 if (!out->dst) { 70 if (!out->dst) {
70 DSSERR("output doesn't have a device connected to it\n"); 71 dev_err(out->dev,
72 "output doesn't have a device connected to it\n");
71 r = -EINVAL; 73 r = -EINVAL;
72 goto err; 74 goto err;
73 } 75 }
74 76
75 if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) { 77 if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
76 DSSERR("device %s is not disabled, cannot unset device\n", 78 dev_err(out->dev,
77 out->dst->name); 79 "device %s is not disabled, cannot unset device\n",
80 out->dst->name);
78 r = -EINVAL; 81 r = -EINVAL;
79 goto err; 82 goto err;
80 } 83 }