| Message ID | 1357169268-13028-2-git-send-email-ihadzic@research.bell-labs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
For the series: Reviewed-by: Marek Olšák <maraeo@gmail.com> Marek On Thu, Jan 3, 2013 at 12:27 AM, Ilija Hadzic <ihadzic@research.bell-labs.com> wrote: > length_dw field was assigned twice. While at it, move user_ptr > assignment together with all other assignments to p->chunks[i] > structure to make the code more readable. > > Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com> > --- > drivers/gpu/drm/radeon/radeon_cs.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c > index 396baba0..4be64e0 100644 > --- a/drivers/gpu/drm/radeon/radeon_cs.c > +++ b/drivers/gpu/drm/radeon/radeon_cs.c > @@ -203,7 +203,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) > p->chunks[i].length_dw = user_chunk.length_dw; > p->chunks[i].kdata = NULL; > p->chunks[i].chunk_id = user_chunk.chunk_id; > - > + p->chunks[i].user_ptr = (void __user *)(unsigned long)user_chunk.chunk_data; > if (p->chunks[i].chunk_id == RADEON_CHUNK_ID_RELOCS) { > p->chunk_relocs_idx = i; > } > @@ -226,9 +226,6 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) > return -EINVAL; > } > > - p->chunks[i].length_dw = user_chunk.length_dw; > - p->chunks[i].user_ptr = (void __user *)(unsigned long)user_chunk.chunk_data; > - > cdata = (uint32_t *)(unsigned long)user_chunk.chunk_data; > if ((p->chunks[i].chunk_id == RADEON_CHUNK_ID_RELOCS) || > (p->chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS)) { > -- > 1.7.12 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 396baba0..4be64e0 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -203,7 +203,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) p->chunks[i].length_dw = user_chunk.length_dw; p->chunks[i].kdata = NULL; p->chunks[i].chunk_id = user_chunk.chunk_id; - + p->chunks[i].user_ptr = (void __user *)(unsigned long)user_chunk.chunk_data; if (p->chunks[i].chunk_id == RADEON_CHUNK_ID_RELOCS) { p->chunk_relocs_idx = i; } @@ -226,9 +226,6 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) return -EINVAL; } - p->chunks[i].length_dw = user_chunk.length_dw; - p->chunks[i].user_ptr = (void __user *)(unsigned long)user_chunk.chunk_data; - cdata = (uint32_t *)(unsigned long)user_chunk.chunk_data; if ((p->chunks[i].chunk_id == RADEON_CHUNK_ID_RELOCS) || (p->chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS)) {
length_dw field was assigned twice. While at it, move user_ptr assignment together with all other assignments to p->chunks[i] structure to make the code more readable. Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com> --- drivers/gpu/drm/radeon/radeon_cs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)