diff mbox

[5/9] drm/i915: Adjust seven checks for null pointers

Message ID 0fb8a6a5-f9ee-1e5d-d52d-5faca3ecde0d@users.sourceforge.net (mailing list archive)
State New, archived
Headers show

Commit Message

SF Markus Elfring May 4, 2017, 4:56 p.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 4 May 2017 13:52:19 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl” pointed information out like the following.

Comparison to NULL could be written …

Thus fix affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Jani Nikula May 5, 2017, 5:46 a.m. UTC | #1 
On Thu, 04 May 2017, SF Markus Elfring <elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Thu, 4 May 2017 13:52:19 +0200
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> The script “checkpatch.pl” pointed information out like the following.
>
> Comparison to NULL could be written …

Could be written one way or the other. We have and accept
both. Sometimes explicit comparison with NULL is preferred, depending on
judgement, not based on what a tool says.

BR,
Jani.


>
> Thus fix affected source code places.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index bf9a2e8d8c16..d9c699d7245e 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -242,7 +242,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
>  		if (count == total)
>  			break;
>  
> -		if (obj->stolen == NULL)
> +		if (!obj->stolen)
>  			continue;
>  
>  		objects[count++] = obj;
> @@ -254,7 +254,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
>  		if (count == total)
>  			break;
>  
> -		if (obj->stolen == NULL)
> +		if (!obj->stolen)
>  			continue;
>  
>  		objects[count++] = obj;
> @@ -557,7 +557,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
>  
>  		spin_lock_irq(&dev->event_lock);
>  		work = crtc->flip_work;
> -		if (work == NULL) {
> +		if (!work) {
>  			seq_printf(m, "No flip due on pipe %c (plane %c)\n",
>  				   pipe, plane);
>  		} else {
> @@ -3717,7 +3717,7 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
>  			continue;
>  
>  		if (connector->status == connector_status_connected &&
> -		    connector->encoder != NULL) {
> +		    connector->encoder) {
>  			intel_dp = enc_to_intel_dp(connector->encoder);
>  			status = kstrtoint(input_buffer, 10, &val);
>  			if (status < 0)
> @@ -3756,7 +3756,7 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
>  			continue;
>  
>  		if (connector->status == connector_status_connected &&
> -		    connector->encoder != NULL) {
> +		    connector->encoder) {
>  			intel_dp = enc_to_intel_dp(connector->encoder);
>  			seq_putc(m,
>  				 intel_dp->compliance.test_active ? '1' : '0');
> @@ -3801,7 +3801,7 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
>  			continue;
>  
>  		if (connector->status == connector_status_connected &&
> -		    connector->encoder != NULL) {
> +		    connector->encoder) {
>  			intel_dp = enc_to_intel_dp(connector->encoder);
>  			if (intel_dp->compliance.test_type ==
>  			    DP_TEST_LINK_EDID_READ)
> @@ -3855,7 +3855,7 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
>  			continue;
>  
>  		if (connector->status == connector_status_connected &&
> -		    connector->encoder != NULL) {
> +		    connector->encoder) {
>  			intel_dp = enc_to_intel_dp(connector->encoder);
>  			seq_printf(m, "%02lx", intel_dp->compliance.test_type);
>  		} else {
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index bf9a2e8d8c16..d9c699d7245e 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -242,7 +242,7 @@  static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
 		if (count == total)
 			break;
 
-		if (obj->stolen == NULL)
+		if (!obj->stolen)
 			continue;
 
 		objects[count++] = obj;
@@ -254,7 +254,7 @@  static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
 		if (count == total)
 			break;
 
-		if (obj->stolen == NULL)
+		if (!obj->stolen)
 			continue;
 
 		objects[count++] = obj;
@@ -557,7 +557,7 @@  static int i915_gem_pageflip_info(struct seq_file *m, void *data)
 
 		spin_lock_irq(&dev->event_lock);
 		work = crtc->flip_work;
-		if (work == NULL) {
+		if (!work) {
 			seq_printf(m, "No flip due on pipe %c (plane %c)\n",
 				   pipe, plane);
 		} else {
@@ -3717,7 +3717,7 @@  static ssize_t i915_displayport_test_active_write(struct file *file,
 			continue;
 
 		if (connector->status == connector_status_connected &&
-		    connector->encoder != NULL) {
+		    connector->encoder) {
 			intel_dp = enc_to_intel_dp(connector->encoder);
 			status = kstrtoint(input_buffer, 10, &val);
 			if (status < 0)
@@ -3756,7 +3756,7 @@  static int i915_displayport_test_active_show(struct seq_file *m, void *data)
 			continue;
 
 		if (connector->status == connector_status_connected &&
-		    connector->encoder != NULL) {
+		    connector->encoder) {
 			intel_dp = enc_to_intel_dp(connector->encoder);
 			seq_putc(m,
 				 intel_dp->compliance.test_active ? '1' : '0');
@@ -3801,7 +3801,7 @@  static int i915_displayport_test_data_show(struct seq_file *m, void *data)
 			continue;
 
 		if (connector->status == connector_status_connected &&
-		    connector->encoder != NULL) {
+		    connector->encoder) {
 			intel_dp = enc_to_intel_dp(connector->encoder);
 			if (intel_dp->compliance.test_type ==
 			    DP_TEST_LINK_EDID_READ)
@@ -3855,7 +3855,7 @@  static int i915_displayport_test_type_show(struct seq_file *m, void *data)
 			continue;
 
 		if (connector->status == connector_status_connected &&
-		    connector->encoder != NULL) {
+		    connector->encoder) {
 			intel_dp = enc_to_intel_dp(connector->encoder);
 			seq_printf(m, "%02lx", intel_dp->compliance.test_type);
 		} else {