aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/Makefile2
-rw-r--r--drivers/gpu/drm/drm_dp_helper.c (renamed from drivers/gpu/drm/drm_dp_i2c_helper.c)5
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 2ff5cefe9ead..dc4e88f9fb11 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -19,7 +19,7 @@ drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
19 19
20drm-usb-y := drm_usb.o 20drm-usb-y := drm_usb.o
21 21
22drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o 22drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o
23drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o 23drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
24drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o 24drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
25 25
diff --git a/drivers/gpu/drm/drm_dp_i2c_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 7f246f212457..bb4eaf60117f 100644
--- a/drivers/gpu/drm/drm_dp_i2c_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -37,7 +37,7 @@ i2c_algo_dp_aux_transaction(struct i2c_adapter *adapter, int mode,
37{ 37{
38 struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data; 38 struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
39 int ret; 39 int ret;
40 40
41 ret = (*algo_data->aux_ch)(adapter, mode, 41 ret = (*algo_data->aux_ch)(adapter, mode,
42 write_byte, read_byte); 42 write_byte, read_byte);
43 return ret; 43 return ret;
@@ -182,7 +182,6 @@ i2c_dp_aux_reset_bus(struct i2c_adapter *adapter)
182{ 182{
183 (void) i2c_algo_dp_aux_address(adapter, 0, false); 183 (void) i2c_algo_dp_aux_address(adapter, 0, false);
184 (void) i2c_algo_dp_aux_stop(adapter, false); 184 (void) i2c_algo_dp_aux_stop(adapter, false);
185
186} 185}
187 186
188static int 187static int
@@ -198,7 +197,7 @@ int
198i2c_dp_aux_add_bus(struct i2c_adapter *adapter) 197i2c_dp_aux_add_bus(struct i2c_adapter *adapter)
199{ 198{
200 int error; 199 int error;
201 200
202 error = i2c_dp_aux_prepare_bus(adapter); 201 error = i2c_dp_aux_prepare_bus(adapter);
203 if (error) 202 if (error)
204 return error; 203 return error;