diff mbox

[11/12] drm/i915: Minor code clean up in intel_dp.c

Message ID 1405365047-6866-12-git-send-email-tprevite@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Todd Previte July 14, 2014, 7:10 p.m. UTC 
Cleans up a couple of unused variables and an extraneous debug log
message that was unintentionally left behind.

Signed-off-by: Todd Previte <tprevite@gmail.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Daniel Vetter July 15, 2014, 7:47 a.m. UTC | #1 
On Mon, Jul 14, 2014 at 12:10:46PM -0700, Todd Previte wrote:
> Cleans up a couple of unused variables and an extraneous debug log
> message that was unintentionally left behind.
> 
> Signed-off-by: Todd Previte <tprevite@gmail.com>

This should be squashed into the relevant earlier patches.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_dp.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index e4b31ad..0e207aaf 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3430,7 +3430,6 @@ intel_dp_autotest_link_training(struct intel_dp *intel_dp)
>  	uint8_t rxdata[2];
>  	uint8_t link_status[DP_LINK_STATUS_SIZE];
>  	int bytes_ret = 0;
> -	struct drm_connector *connector = &intel_dp->attached_connector->base;
>  	struct intel_digital_port *intel_dig_port =
>  		enc_to_dig_port(&intel_dp->attached_connector->encoder->base);
>  
> @@ -3494,7 +3493,7 @@ intel_dp_autotest_edid(struct intel_dp *intel_dp)
>  	struct edid *edid_read = NULL;
>  	uint8_t *edid_data = NULL;
>  	uint8_t test_result = DP_TEST_NAK, checksum = 0;
> -	uint32_t i = 0, ret = 0;
> +	uint32_t ret = 0;
>  	struct drm_display_mode *use_mode = NULL;
>  	int mode_count = 0;
>  	struct drm_mode_set modeset;
> @@ -3592,7 +3591,6 @@ intel_dp_handle_test_request(struct intel_dp *intel_dp)
>  	uint8_t rxdata = 0;
>  	int ret = 0;
>  
> -	DRM_DEBUG_KMS("Displayport: Received automated test request\n");
>  	/* Read DP_TEST_REQUEST register to identify the requested test */
>  	ret = drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_REQUEST, &rxdata, 1);
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Todd Previte July 15, 2014, 3:35 p.m. UTC | #2 
> Daniel Vetter <mailto:daniel@ffwll.ch>
> Tuesday, July 15, 2014 12:47 AM
> On Mon, Jul 14, 2014 at 12:10:46PM -0700, Todd Previte wrote:
>> Cleans up a couple of unused variables and an extraneous debug log
>> message that was unintentionally left behind.
>>
>> Signed-off-by: Todd Previte<tprevite@gmail.com>
>
> This should be squashed into the relevant earlier patches.
> -Daniel
Sounds good. I'll squash them in and resend the patches as v3. Thanks 
Daniel.

-T
>> ---
>>   drivers/gpu/drm/i915/intel_dp.c | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index e4b31ad..0e207aaf 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -3430,7 +3430,6 @@ intel_dp_autotest_link_training(struct intel_dp *intel_dp)
>>   	uint8_t rxdata[2];
>>   	uint8_t link_status[DP_LINK_STATUS_SIZE];
>>   	int bytes_ret = 0;
>> -	struct drm_connector *connector =&intel_dp->attached_connector->base;
>>   	struct intel_digital_port *intel_dig_port =
>>   		enc_to_dig_port(&intel_dp->attached_connector->encoder->base);
>>
>> @@ -3494,7 +3493,7 @@ intel_dp_autotest_edid(struct intel_dp *intel_dp)
>>   	struct edid *edid_read = NULL;
>>   	uint8_t *edid_data = NULL;
>>   	uint8_t test_result = DP_TEST_NAK, checksum = 0;
>> -	uint32_t i = 0, ret = 0;
>> +	uint32_t ret = 0;
>>   	struct drm_display_mode *use_mode = NULL;
>>   	int mode_count = 0;
>>   	struct drm_mode_set modeset;
>> @@ -3592,7 +3591,6 @@ intel_dp_handle_test_request(struct intel_dp *intel_dp)
>>   	uint8_t rxdata = 0;
>>   	int ret = 0;
>>
>> -	DRM_DEBUG_KMS("Displayport: Received automated test request\n");
>>   	/* Read DP_TEST_REQUEST register to identify the requested test */
>>   	ret = drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_REQUEST,&rxdata, 1);
>>
>> -- 
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> Todd Previte <mailto:tprevite@gmail.com>
> Monday, July 14, 2014 12:10 PM
> Cleans up a couple of unused variables and an extraneous debug log
> message that was unintentionally left behind.
>
> Signed-off-by: Todd Previte <tprevite@gmail.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c 
> b/drivers/gpu/drm/i915/intel_dp.c
> index e4b31ad..0e207aaf 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3430,7 +3430,6 @@ intel_dp_autotest_link_training(struct intel_dp 
> *intel_dp)
> uint8_t rxdata[2];
> uint8_t link_status[DP_LINK_STATUS_SIZE];
> int bytes_ret = 0;
> - struct drm_connector *connector = &intel_dp->attached_connector->base;
> struct intel_digital_port *intel_dig_port =
> enc_to_dig_port(&intel_dp->attached_connector->encoder->base);
>
> @@ -3494,7 +3493,7 @@ intel_dp_autotest_edid(struct intel_dp *intel_dp)
> struct edid *edid_read = NULL;
> uint8_t *edid_data = NULL;
> uint8_t test_result = DP_TEST_NAK, checksum = 0;
> - uint32_t i = 0, ret = 0;
> + uint32_t ret = 0;
> struct drm_display_mode *use_mode = NULL;
> int mode_count = 0;
> struct drm_mode_set modeset;
> @@ -3592,7 +3591,6 @@ intel_dp_handle_test_request(struct intel_dp 
> *intel_dp)
> uint8_t rxdata = 0;
> int ret = 0;
>
> - DRM_DEBUG_KMS("Displayport: Received automated test request\n");
> /* Read DP_TEST_REQUEST register to identify the requested test */
> ret = drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_REQUEST, &rxdata, 1);
>
> Todd Previte <mailto:tprevite@gmail.com>
> Monday, July 14, 2014 12:10 PM
>
> V2:
> - Addressed review feedback from the mailing list
> - Broke up patches into smaller, easily managed chunks
> - Reordered the patches such that they can be applied in order
> - Fixed checkpatch.pl errors across the patchset
> - Updated and enhanced functionality for the EDID test function
> - Completely revamped the mode set operations for compliance testing
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e4b31ad..0e207aaf 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3430,7 +3430,6 @@  intel_dp_autotest_link_training(struct intel_dp *intel_dp)
 	uint8_t rxdata[2];
 	uint8_t link_status[DP_LINK_STATUS_SIZE];
 	int bytes_ret = 0;
-	struct drm_connector *connector = &intel_dp->attached_connector->base;
 	struct intel_digital_port *intel_dig_port =
 		enc_to_dig_port(&intel_dp->attached_connector->encoder->base);
 
@@ -3494,7 +3493,7 @@  intel_dp_autotest_edid(struct intel_dp *intel_dp)
 	struct edid *edid_read = NULL;
 	uint8_t *edid_data = NULL;
 	uint8_t test_result = DP_TEST_NAK, checksum = 0;
-	uint32_t i = 0, ret = 0;
+	uint32_t ret = 0;
 	struct drm_display_mode *use_mode = NULL;
 	int mode_count = 0;
 	struct drm_mode_set modeset;
@@ -3592,7 +3591,6 @@  intel_dp_handle_test_request(struct intel_dp *intel_dp)
 	uint8_t rxdata = 0;
 	int ret = 0;
 
-	DRM_DEBUG_KMS("Displayport: Received automated test request\n");
 	/* Read DP_TEST_REQUEST register to identify the requested test */
 	ret = drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_REQUEST, &rxdata, 1);