> -----Original Message----- > From: Michele CURTI [mailto:michele.curti@xxxxxxxxx] > Sent: Saturday, May 03, 2014 9:55 AM > To: Deucher, Alexander; Koenig, Christian; airlied@xxxxxxxx > Cc: linux-next@xxxxxxxxxxxxxxx > Subject: [PATCH] drm/radeon: use NULL instead of zero > > > Use NULL instead of zero for NULL pointers > > Signed-off-by: Michele Curti <michele.curti@xxxxxxxxx> Can you break this into two patches? One that changes that clearstate headers and one that changes object functions? Thanks, Alex > --- > 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(-) > > diff --git a/drivers/gpu/drm/radeon/clearstate_cayman.h > b/drivers/gpu/drm/radeon/clearstate_cayman.h > index aa908c5..ee428ac 100644 > --- a/drivers/gpu/drm/radeon/clearstate_cayman.h > +++ b/drivers/gpu/drm/radeon/clearstate_cayman.h > @@ -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 } > }; > diff --git a/drivers/gpu/drm/radeon/clearstate_ci.h > b/drivers/gpu/drm/radeon/clearstate_ci.h > index c3982f9..1673c34 100644 > --- a/drivers/gpu/drm/radeon/clearstate_ci.h > +++ b/drivers/gpu/drm/radeon/clearstate_ci.h > @@ -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 } > }; > diff --git a/drivers/gpu/drm/radeon/clearstate_si.h > b/drivers/gpu/drm/radeon/clearstate_si.h > index b994cb2..60474b8 100644 > --- a/drivers/gpu/drm/radeon/clearstate_si.h > +++ b/drivers/gpu/drm/radeon/clearstate_si.h > @@ -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 } > }; > diff --git a/drivers/gpu/drm/radeon/radeon_object.c > b/drivers/gpu/drm/radeon/radeon_object.c > index 19bec0d..95197aa 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -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); > diff --git a/drivers/gpu/drm/radeon/radeon_object.h > b/drivers/gpu/drm/radeon/radeon_object.h > index 9e7b25a..5a873f3 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.h > +++ b/drivers/gpu/drm/radeon/radeon_object.h > @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
