Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e7fe2fe authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2470fecc

drivers/gpu/drm/i2c/tda998x_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -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,13 +1059,13 @@ 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",

		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;

}