diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-07 19:13:23 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-14 20:11:12 +0000 |
| commit | 5e7fe2fef4347d7a09bb15588d8bbe3cb83b6ed4 (patch) | |
| tree | 49af239a032acec23e5271a21a6b09ea53e59bd9 /drivers/gpu/drm/i2c/tda998x_drv.c | |
| parent | 2470feccbf030652380c2d73304576137b0fb12e (diff) | |
| download | linux-5e7fe2fef4347d7a09bb15588d8bbe3cb83b6ed4.tar.gz linux-5e7fe2fef4347d7a09bb15588d8bbe3cb83b6ed4.tar.bz2 linux-5e7fe2fef4347d7a09bb15588d8bbe3cb83b6ed4.zip | |
drm/i2c: tda998x: always use the same device for all kernel messages
Rather than using a mixture of the parent DRM device and the component
device for messages from the driver, consistently use the component
device for all messages.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/i2c/tda998x_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i2c/tda998x_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index d0f3a4cbb866..48af5cac1902 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1044,7 +1044,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) !priv->wq_edid_wait, msecs_to_jiffies(100)); if (i < 0) { - dev_err(encoder->dev->dev, "read edid wait err %d\n", i); + dev_err(&priv->hdmi->dev, "read edid wait err %d\n", i); return i; } } else { @@ -1059,14 +1059,14 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) } if (i == 0) { - dev_err(encoder->dev->dev, "read edid timeout\n"); + dev_err(&priv->hdmi->dev, "read edid timeout\n"); return -ETIMEDOUT; } ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH); if (ret != EDID_LENGTH) { - dev_err(encoder->dev->dev, "failed to read edid block %d: %d\n", - blk, ret); + dev_err(&priv->hdmi->dev, "failed to read edid block %d: %d\n", + blk, ret); return ret; } @@ -1132,7 +1132,7 @@ done: fail: if (priv->rev == TDA19988) reg_set(priv, REG_TX4, TX4_PD_RAM); - dev_warn(encoder->dev->dev, "failed to read EDID\n"); + dev_warn(&priv->hdmi->dev, "failed to read EDID\n"); kfree(block); return NULL; } |