Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i2c: tda998x: always use the same device for all kernel messages

Browse Source 
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>
This commit is contained in:
Russell King 2014-02-07 19:13:23 +00:00
parent 2470feccbf
commit 5e7fe2fef4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i2c/tda998x_drv.c
View File

@ -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;
}