Skip to contentSkip to conversation

drm/radeon: use NULL instead of zero

PATCH Superseded Michele CURTI 2 participants 6 messages May 3, 2014 – May 6, 2014

Subsystems (3)
DRM drivers Linux-next tree Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Michele CURTI

author
#0 lore raw

PATCH 1/1 drm/radeon: use NULL instead of zero

Use NULL instead of zero for NULL pointers

Signed-off-by Michele Curti <[email protected]>
---
 drivers/gpu/drm/radeon/clearstate_cayman.h | 8 ++++----
 drivers/gpu/drm/radeon/clearstate_ci.h     | 4 ++--
 drivers/gpu/drm/radeon/clearstate_si.h     | 4 ++--
 drivers/gpu/drm/radeon/radeon_object.c     | 2 +-
 drivers/gpu/drm/radeon/radeon_object.h     | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/radeon/clearstate_cayman.h +4 -4
index aa908c5..ee428ac 100644
@@ -1050,7 +1050,7 @@ static const struct cs_extent_def SECT_CONTEXT_defs[] =
     {SECT_CONTEXT_def_5, 0x0000a29e, 5 },
     {SECT_CONTEXT_def_6, 0x0000a2a5, 56 },
     {SECT_CONTEXT_def_7, 0x0000a2de, 290 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CLEAR_def_1[] =
 {

@@ -1061,7 +1061,7 @@ static const u32 SECT_CLEAR_def_1[] =
 static const struct cs_extent_def SECT_CLEAR_defs[] =
 {
     {SECT_CLEAR_def_1, 0x0000ffc0, 3 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CTRLCONST_def_1[] =
 {

@@ -1071,11 +1071,11 @@ static const u32 SECT_CTRLCONST_def_1[] =
 static const struct cs_extent_def SECT_CTRLCONST_defs[] =
 {
     {SECT_CTRLCONST_def_1, 0x0000f3fc, 2 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def cayman_cs_data[] = {
     { SECT_CONTEXT_defs, SECT_CONTEXT },
     { SECT_CLEAR_defs, SECT_CLEAR },
     { SECT_CTRLCONST_defs, SECT_CTRLCONST },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_ci.h +2 -2
index c3982f9..1673c34 100644
@@ -936,9 +936,9 @@ static const struct cs_extent_def ci_SECT_CONTEXT_defs[] =
     {ci_SECT_CONTEXT_def_5, 0x0000a2a0, 2 },
     {ci_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {ci_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def ci_cs_data[] = {
     { ci_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_si.h +2 -2
index b994cb2..60474b8 100644
@@ -933,9 +933,9 @@ static const struct cs_extent_def si_SECT_CONTEXT_defs[] =
     {si_SECT_CONTEXT_def_5, 0x0000a2a1, 1 },
     {si_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {si_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def si_cs_data[] = {
     { si_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/radeon_object.c +1 -1
index 19bec0d..95197aa 100644
@@ -722,7 +722,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL);
 	if (unlikely(r != 0))
 		return r;
 	spin_lock(&bo->tbo.bdev->fence_lock);
drivers/gpu/drm/radeon/radeon_object.h +1 -1
index 9e7b25a..5a873f3 100644
@@ -65,7 +65,7 @@ static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, NULL);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS)
 			dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
Signature · 4 lines
1.9.2

Regards,
Michele
maintainer
#1 lore raw
Quoted 11 lines

-----Original Message-----
From: Michele CURTI [mailto:[email protected]]
Sent: Saturday, May 03, 2014 9:55 AM
To: Deucher, Alexander; Koenig, Christian; [email protected]
Cc: [email protected]
Subject: [PATCH] drm/radeon: use NULL instead of zero

Use NULL instead of zero for NULL pointers

Signed-off-by Michele Curti <[email protected]>

Can you break this into two patches? One that changes that clearstate headers and one that changes object functions?

Thanks,

Alex

Quoted 117 lines
---
 drivers/gpu/drm/radeon/clearstate_cayman.h | 8 ++++----
 drivers/gpu/drm/radeon/clearstate_ci.h     | 4 ++--
 drivers/gpu/drm/radeon/clearstate_si.h     | 4 ++--
 drivers/gpu/drm/radeon/radeon_object.c     | 2 +-
 drivers/gpu/drm/radeon/radeon_object.h     | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/radeon/clearstate_cayman.h +0 -0
index aa908c5..ee428ac 100644
@@ -1050,7 +1050,7 @@ static const struct cs_extent_def

SECT_CONTEXT_defs[] =

     {SECT_CONTEXT_def_5, 0x0000a29e, 5 },
     {SECT_CONTEXT_def_6, 0x0000a2a5, 56 },
     {SECT_CONTEXT_def_7, 0x0000a2de, 290 },
drivers/gpu/drm/radeon/clearstate_cayman.h +4 -4
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CLEAR_def_1[] =
 {

@@ -1061,7 +1061,7 @@ static const u32 SECT_CLEAR_def_1[] =
 static const struct cs_extent_def SECT_CLEAR_defs[] =
 {
     {SECT_CLEAR_def_1, 0x0000ffc0, 3 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CTRLCONST_def_1[] =
 {

@@ -1071,11 +1071,11 @@ static const u32 SECT_CTRLCONST_def_1[] =
 static const struct cs_extent_def SECT_CTRLCONST_defs[] =
 {
     {SECT_CTRLCONST_def_1, 0x0000f3fc, 2 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def cayman_cs_data[] = {
     { SECT_CONTEXT_defs, SECT_CONTEXT },
     { SECT_CLEAR_defs, SECT_CLEAR },
     { SECT_CTRLCONST_defs, SECT_CTRLCONST },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_ci.h +0 -0
index c3982f9..1673c34 100644
@@ -936,9 +936,9 @@ static const struct cs_extent_def

ci_SECT_CONTEXT_defs[] =

     {ci_SECT_CONTEXT_def_5, 0x0000a2a0, 2 },
     {ci_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {ci_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
drivers/gpu/drm/radeon/clearstate_ci.h +2 -2
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def ci_cs_data[] = {
     { ci_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_si.h +0 -0
index b994cb2..60474b8 100644
@@ -933,9 +933,9 @@ static const struct cs_extent_def

si_SECT_CONTEXT_defs[] =

     {si_SECT_CONTEXT_def_5, 0x0000a2a1, 1 },
     {si_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {si_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
drivers/gpu/drm/radeon/clearstate_si.h +2 -2
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def si_cs_data[] = {
     { si_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/radeon_object.c +1 -1
index 19bec0d..95197aa 100644
@@ -722,7 +722,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32
 *mem_type, bool no_wait)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL);
 	if (unlikely(r != 0))
 		return r;
drivers/gpu/drm/radeon/radeon_object.c +0 -0
 	spin_lock(&bo->tbo.bdev->fence_lock);
drivers/gpu/drm/radeon/radeon_object.h +1 -1
index 9e7b25a..5a873f3 100644
@@ -65,7 +65,7 @@ static inline int radeon_bo_reserve(struct radeon_bo
 *bo, bool no_intr)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, NULL);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS)

dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
--
1.9.2

Regards,
Michele

author
#2 lore raw

v2 cover drm/radeon: use NULL instead of zero

This patches replace 0 with NULL when NULL pointers in radeon driver. The first in object functions.
the second in clearstate headers.

Changes from v1:
- splitted in two separated patches

Quoted 10 lines · Alexander
Quoted 10 lines

-----Original Message-----
From: Michele CURTI [mailto:[email protected]]
Sent: Saturday, May 03, 2014 9:55 AM
To: Deucher, Alexander; Koenig, Christian; [email protected]
Cc: [email protected]
Subject: [PATCH] drm/radeon: use NULL instead of zero

Use NULL instead of zero for NULL pointers

Quoted 8 lines
Quoted 1 line
Signed-off-by Michele Curti <[email protected]>

Can you break this into two patches? One that changes that clearstate headers and one that changes object functions?

Thanks,

Alex

Sure!
Or at least, I'm going to try..
Michele

maintainer Reviewed-by on the v2 series
#3 lore raw
Quoted 7 lines

-----Original Message-----
From: Michele CURTI [mailto:[email protected]]
Sent: Monday, May 05, 2014 4:27 PM
To: Deucher, Alexander
Cc: Koenig, Christian; [email protected]; [email protected]
Subject: [PATCH v2 0/2] drm/radeon: use NULL instead of zero

Quoted 6 lines

This patches replace 0 with NULL when NULL pointers in radeon driver. The first in object functions.
the second in clearstate headers.

Changes from v1:
- splitted in two separated patches

For the series:

Reviewed-by Alex Deucher <[email protected]>

We'll pick these up for 3.16.

Alex

Quoted 25 lines · Alexander
Quoted 8 lines
Quoted 8 lines

-----Original Message-----
From: Michele CURTI [mailto:[email protected]]
Sent: Saturday, May 03, 2014 9:55 AM
To: Deucher, Alexander; Koenig, Christian; [email protected]
Cc: [email protected]
Subject: [PATCH] drm/radeon: use NULL instead of zero

Quoted 5 lines
Quoted 3 lines

Use NULL instead of zero for NULL pointers

Signed-off-by Michele Curti <[email protected]>

Can you break this into two patches? One that changes that clearstate

headers and one that changes object functions?

Quoted 5 lines

Thanks,

Alex

Sure!
Or at least, I'm going to try..
Michele

author
#4 lore raw

PATCH v2 1/2 drm/radeon: use NULL instead of zero in object functions

In reply to Deucher, Alexander

drm/radeon: use NULL instead of zero in object functions

Signed-off-by Michele Curti <[email protected]>
---
 drivers/gpu/drm/radeon/radeon_object.c | 2 +-
 drivers/gpu/drm/radeon/radeon_object.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_object.c +1 -1
index 19bec0d..95197aa 100644
@@ -722,7 +722,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL);
 	if (unlikely(r != 0))
 		return r;
 	spin_lock(&bo->tbo.bdev->fence_lock);
drivers/gpu/drm/radeon/radeon_object.h +1 -1
index 9e7b25a..5a873f3 100644
@@ -65,7 +65,7 @@ static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0);
+	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, NULL);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS)
 			dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
Signature · 1 line
1.9.2
author
#5 lore raw

PATCH v2 2/2 drm/radeon: use NULL instead of zero in clearstate headers

In reply to Deucher, Alexander

drm/radeon: use NULL instead of zero in clearstate headers

Signed-off-by Michele Curti <[email protected]>
---
 drivers/gpu/drm/radeon/clearstate_cayman.h | 8 ++++----
 drivers/gpu/drm/radeon/clearstate_ci.h     | 4 ++--
 drivers/gpu/drm/radeon/clearstate_si.h     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/clearstate_cayman.h +4 -4
index aa908c5..ee428ac 100644
@@ -1050,7 +1050,7 @@ static const struct cs_extent_def SECT_CONTEXT_defs[] =
     {SECT_CONTEXT_def_5, 0x0000a29e, 5 },
     {SECT_CONTEXT_def_6, 0x0000a2a5, 56 },
     {SECT_CONTEXT_def_7, 0x0000a2de, 290 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CLEAR_def_1[] =
 {

@@ -1061,7 +1061,7 @@ static const u32 SECT_CLEAR_def_1[] =
 static const struct cs_extent_def SECT_CLEAR_defs[] =
 {
     {SECT_CLEAR_def_1, 0x0000ffc0, 3 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const u32 SECT_CTRLCONST_def_1[] =
 {

@@ -1071,11 +1071,11 @@ static const u32 SECT_CTRLCONST_def_1[] =
 static const struct cs_extent_def SECT_CTRLCONST_defs[] =
 {
     {SECT_CTRLCONST_def_1, 0x0000f3fc, 2 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def cayman_cs_data[] = {
     { SECT_CONTEXT_defs, SECT_CONTEXT },
     { SECT_CLEAR_defs, SECT_CLEAR },
     { SECT_CTRLCONST_defs, SECT_CTRLCONST },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_ci.h +2 -2
index c3982f9..1673c34 100644
@@ -936,9 +936,9 @@ static const struct cs_extent_def ci_SECT_CONTEXT_defs[] =
     {ci_SECT_CONTEXT_def_5, 0x0000a2a0, 2 },
     {ci_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {ci_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def ci_cs_data[] = {
     { ci_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
drivers/gpu/drm/radeon/clearstate_si.h +2 -2
index b994cb2..60474b8 100644
@@ -933,9 +933,9 @@ static const struct cs_extent_def si_SECT_CONTEXT_defs[] =
     {si_SECT_CONTEXT_def_5, 0x0000a2a1, 1 },
     {si_SECT_CONTEXT_def_6, 0x0000a2a3, 1 },
     {si_SECT_CONTEXT_def_7, 0x0000a2a5, 233 },
-    { 0, 0, 0 }
+    {NULL, 0, 0 }
 };
 static const struct cs_section_def si_cs_data[] = {
     { si_SECT_CONTEXT_defs, SECT_CONTEXT },
-    { 0, SECT_NONE }
+    { NULL, SECT_NONE }
 };
Signature · 1 line
1.9.2