2017-08-24 15:43:34

by Abishek V Ashok

[permalink] [raw]
Subject: [PATCH] Staging: Android: fix code style in ion_cma_heap.c

This is a patch to the ion_cma_heap.c file in
/drivers/staging/andrioid/ion that fixes a blank line and
kmalloc size warning found by the checkpatch.pl tool.

Signed-off-by: Abhishek V Ashok <[email protected]>
---
drivers/staging/android/ion/ion_cma_heap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
index a0949bc0..1589b9e0 100644
--- a/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -31,7 +31,6 @@ struct ion_cma_heap {

#define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap)

-
/* ION CMA heap operations functions */
static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
unsigned long len,
@@ -46,7 +45,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
if (!pages)
return -ENOMEM;

- table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
+ table = kmalloc(sizeof(struct * table), GFP_KERNEL);
if (!table)
goto err;

--
2.11.0


2017-08-24 15:56:03

by Laura Abbott

[permalink] [raw]
Subject: Re: [PATCH] Staging: Android: fix code style in ion_cma_heap.c

On 08/24/2017 08:40 AM, Abishek V Ashok wrote:
> This is a patch to the ion_cma_heap.c file in
> /drivers/staging/andrioid/ion that fixes a blank line and
> kmalloc size warning found by the checkpatch.pl tool.
>

You've done two things in this patch, please stick to a single
change per patch.

> Signed-off-by: Abhishek V Ashok <[email protected]>
> ---
> drivers/staging/android/ion/ion_cma_heap.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
> index a0949bc0..1589b9e0 100644
> --- a/drivers/staging/android/ion/ion_cma_heap.c
> +++ b/drivers/staging/android/ion/ion_cma_heap.c
> @@ -31,7 +31,6 @@ struct ion_cma_heap {
>
> #define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap)
>
> -
> /* ION CMA heap operations functions */
> static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
> unsigned long len,
> @@ -46,7 +45,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
> if (!pages)
> return -ENOMEM;
>
> - table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
> + table = kmalloc(sizeof(struct * table), GFP_KERNEL);
> if (!table)
> goto err;
>
> --
> 2.11.0
>

2017-08-24 19:08:07

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH] Staging: Android: fix code style in ion_cma_heap.c

On Thu, Aug 24, 2017 at 09:10:50PM +0530, Abishek V Ashok wrote:
> @@ -46,7 +45,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
> if (!pages)
> return -ENOMEM;
>
> - table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
> + table = kmalloc(sizeof(struct * table), GFP_KERNEL);

You didn't try compile this.

regards,
dan carpenter

2017-08-24 20:50:59

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] Staging: Android: fix code style in ion_cma_heap.c

On Thu, 2017-08-24 at 21:10 +0530, Abishek V Ashok wrote:
> This is a patch to the ion_cma_heap.c file in
> /drivers/staging/andrioid/ion that fixes a blank line and
> kmalloc size warning found by the checkpatch.pl tool.
[]
> diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
[]
> @@ -46,7 +45,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
> if (!pages)
> return -ENOMEM;
>
> - table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
> + table = kmalloc(sizeof(struct * table), GFP_KERNEL);

Please make sure you compile the files modified by
your proposed patches before sending the patches.