[PATCH 2/2] drm/exynos: hdmi: use i2c_adapter instead of i2c_client
Inki Dae
inki.dae at samsung.com
Thu Mar 13 00:42:48 PDT 2014
This patch changes i2c_client for ddc to i2c_adapter
because ddc needs only i2c_adapter.
Signed-off-by: Inki Dae <inki.dae at samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index b695398..a060363 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -184,7 +184,7 @@ struct hdmi_context {
void __iomem *regs;
int irq;
- struct i2c_client *ddc_port;
+ struct i2c_adapter *ddc_adpt;
struct i2c_client *hdmiphy_port;
/* current hdmiphy conf regs */
@@ -765,10 +765,10 @@ static int hdmi_get_modes(struct drm_connector *connector)
struct hdmi_context *hdata = ctx_from_connector(connector);
struct edid *edid;
- if (!hdata->ddc_port)
+ if (!hdata->ddc_adpt)
return -ENODEV;
- edid = drm_get_edid(connector, hdata->ddc_port->adapter);
+ edid = drm_get_edid(connector, hdata->ddc_adpt);
if (!edid)
return -ENODEV;
@@ -2040,9 +2040,9 @@ static int hdmi_probe(struct platform_device *pdev)
DRM_ERROR("Failed to find ddc node in device tree\n");
return -ENODEV;
}
- hdata->ddc_port = of_find_i2c_device_by_node(ddc_node);
- if (!hdata->ddc_port) {
- DRM_ERROR("Failed to get ddc i2c client by node\n");
+ hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);
+ if (!hdata->ddc_adpt) {
+ DRM_ERROR("Failed to get ddc i2c adapter by node\n");
return -ENODEV;
}
@@ -2092,7 +2092,7 @@ static int hdmi_probe(struct platform_device *pdev)
err_hdmiphy:
put_device(&hdata->hdmiphy_port->dev);
err_ddc:
- put_device(&hdata->ddc_port->dev);
+ put_device(&hdata->ddc_adpt->dev);
return ret;
}
@@ -2103,7 +2103,7 @@ static int hdmi_remove(struct platform_device *pdev)
struct hdmi_context *hdata = display->ctx;
put_device(&hdata->hdmiphy_port->dev);
- put_device(&hdata->ddc_port->dev);
+ put_device(&hdata->ddc_adpt->dev);
pm_runtime_disable(&pdev->dev);
return 0;
--
1.7.9.5
More information about the dri-devel
mailing list