* [PATCH 0/6] fix drivers/staging/android several coding issues @ 2015-08-25 6:53 Peng Sun 2015-08-25 6:53 ` [PATCH 1/6] fix android/ashmem.c several coding style issues Peng Sun 2015-08-25 15:18 ` [PATCH 0/6] fix drivers/staging/android several coding issues Joe Perches 0 siblings, 2 replies; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun patches based on linux-next next-20150824 Corrections based on checkpatch.pl with --strict Peng Sun (6): fix android/ashmem.c several coding style issues fix android/lowmemorykiller.c several coding style issues fix android/sw_sync.c several coding style issues fix android/sync.c several coding style issues fix android/sync.h several coding style issues fix android/timed_gpio.c several coding style issues drivers/staging/android/ashmem.c | 15 ++++++++------- drivers/staging/android/lowmemorykiller.c | 8 +++++--- drivers/staging/android/sw_sync.c | 6 +++--- drivers/staging/android/sync.c | 22 +++++++++++----------- drivers/staging/android/sync.h | 5 ++--- drivers/staging/android/timed_gpio.c | 15 ++++++++------- 6 files changed, 37 insertions(+), 34 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/6] fix android/ashmem.c several coding style issues 2015-08-25 6:53 [PATCH 0/6] fix drivers/staging/android several coding issues Peng Sun @ 2015-08-25 6:53 ` Peng Sun 2015-08-25 6:53 ` [PATCH 2/6] fix android/lowmemorykiller.c " Peng Sun 2015-08-25 15:18 ` [PATCH 0/6] fix drivers/staging/android several coding issues Joe Perches 1 sibling, 1 reply; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) spaces preferred around that '-' 2) No space is necessary after a case 3) Alignment should match open parenthesis Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/ashmem.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 60200a3..d786ec1 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -618,7 +618,8 @@ static int ashmem_pin(struct ashmem_area *asma, size_t pgstart, size_t pgend) /* Case #3: We overlap from the rear, so adjust it */ if (range->pgend <= pgend) { - range_shrink(range, range->pgstart, pgstart-1); + range_shrink(range, range->pgstart, + pgstart - 1); continue; } @@ -715,7 +716,7 @@ static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd, if (unlikely((pin.offset | pin.len) & ~PAGE_MASK)) return -EINVAL; - if (unlikely(((__u32) -1) - pin.offset < pin.len)) + if (unlikely(((__u32)-1) - pin.offset < pin.len)) return -EINVAL; if (unlikely(PAGE_ALIGN(asma->size) < pin.offset + pin.len)) @@ -759,7 +760,7 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ret = -EINVAL; if (!asma->file) { ret = 0; - asma->size = (size_t) arg; + asma->size = (size_t)arg; } break; case ASHMEM_GET_SIZE: @@ -833,16 +834,16 @@ static int __init ashmem_init(void) int ret; ashmem_area_cachep = kmem_cache_create("ashmem_area_cache", - sizeof(struct ashmem_area), - 0, 0, NULL); + sizeof(struct ashmem_area), + 0, 0, NULL); if (unlikely(!ashmem_area_cachep)) { pr_err("failed to create slab cache\n"); return -ENOMEM; } ashmem_range_cachep = kmem_cache_create("ashmem_range_cache", - sizeof(struct ashmem_range), - 0, 0, NULL); + sizeof(struct ashmem_range), + 0, 0, NULL); if (unlikely(!ashmem_range_cachep)) { pr_err("failed to create slab cache\n"); return -ENOMEM; -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] fix android/lowmemorykiller.c several coding style issues 2015-08-25 6:53 ` [PATCH 1/6] fix android/ashmem.c several coding style issues Peng Sun @ 2015-08-25 6:53 ` Peng Sun 2015-08-25 6:53 ` [PATCH 3/6] fix android/sw_sync.c " Peng Sun 0 siblings, 1 reply; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) Prefer kernel type 'u32' over 'uint32_t' 2) Please use a blank line after function/struct/union/enum declarations 3) Alignment should match open parenthesis Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/lowmemorykiller.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 872bd60..2315e41 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -42,13 +42,14 @@ #include <linux/profile.h> #include <linux/notifier.h> -static uint32_t lowmem_debug_level = 1; +static u32 lowmem_debug_level = 1; static short lowmem_adj[6] = { 0, 1, 6, 12, }; + static int lowmem_adj_size = 4; static int lowmem_minfree[6] = { 3 * 512, /* 6MB */ @@ -56,6 +57,7 @@ static int lowmem_minfree[6] = { 4 * 1024, /* 16MB */ 16 * 1024, /* 64MB */ }; + static int lowmem_minfree_size = 4; static unsigned long lowmem_deathpending_timeout; @@ -104,8 +106,8 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) } lowmem_print(3, "lowmem_scan %lu, %x, ofree %d %d, ma %hd\n", - sc->nr_to_scan, sc->gfp_mask, other_free, - other_file, min_score_adj); + sc->nr_to_scan, sc->gfp_mask, other_free, + other_file, min_score_adj); if (min_score_adj == OOM_SCORE_ADJ_MAX + 1) { lowmem_print(5, "lowmem_scan %lu, %x, return 0\n", -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] fix android/sw_sync.c several coding style issues 2015-08-25 6:53 ` [PATCH 2/6] fix android/lowmemorykiller.c " Peng Sun @ 2015-08-25 6:53 ` Peng Sun 2015-08-25 6:53 ` [PATCH 4/6] fix android/sync.c " Peng Sun 0 siblings, 1 reply; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) Comparison to NULL could be written "!obj" 2) Comparison to NULL could be written "!pt" 3) Comparison to NULL could be written "!fence" Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/sw_sync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index c90838d..29b5c35 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -145,7 +145,7 @@ static int sw_sync_open(struct inode *inode, struct file *file) get_task_comm(task_comm, current); obj = sw_sync_timeline_create(task_comm); - if (obj == NULL) + if (!obj) return -ENOMEM; file->private_data = obj; @@ -179,14 +179,14 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, } pt = sw_sync_pt_create(obj, data.value); - if (pt == NULL) { + if (!pt) { err = -ENOMEM; goto err; } data.name[sizeof(data.name) - 1] = '\0'; fence = sync_fence_create(data.name, pt); - if (fence == NULL) { + if (!fence) { sync_pt_free(pt); err = -ENOMEM; goto err; -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] fix android/sync.c several coding style issues 2015-08-25 6:53 ` [PATCH 3/6] fix android/sw_sync.c " Peng Sun @ 2015-08-25 6:53 ` Peng Sun 2015-08-25 6:53 ` [PATCH 5/6] fix android/sync.h " Peng Sun 0 siblings, 1 reply; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) Comparison to NULL could be written "!*" 2) Alignment should match open parenthesis Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/sync.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index f83e00c..e0c1acb 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -43,7 +43,7 @@ struct sync_timeline *sync_timeline_create(const struct sync_timeline_ops *ops, return NULL; obj = kzalloc(size, GFP_KERNEL); - if (obj == NULL) + if (!obj) return NULL; kref_init(&obj->kref); @@ -130,7 +130,7 @@ struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size) return NULL; pt = kzalloc(size, GFP_KERNEL); - if (pt == NULL) + if (!pt) return NULL; spin_lock_irqsave(&obj->child_list_lock, flags); @@ -155,7 +155,7 @@ static struct sync_fence *sync_fence_alloc(int size, const char *name) struct sync_fence *fence; fence = kzalloc(size, GFP_KERNEL); - if (fence == NULL) + if (!fence) return NULL; fence->file = anon_inode_getfile("sync_fence", &sync_fence_fops, @@ -193,7 +193,7 @@ struct sync_fence *sync_fence_create(const char *name, struct sync_pt *pt) struct sync_fence *fence; fence = sync_fence_alloc(offsetof(struct sync_fence, cbs[1]), name); - if (fence == NULL) + if (!fence) return NULL; fence->num_fences = 1; @@ -215,7 +215,7 @@ struct sync_fence *sync_fence_fdget(int fd) { struct file *file = fget(fd); - if (file == NULL) + if (!file) return NULL; if (file->f_op != &sync_fence_fops) @@ -262,7 +262,7 @@ struct sync_fence *sync_fence_merge(const char *name, unsigned long size = offsetof(struct sync_fence, cbs[num_fences]); fence = sync_fence_alloc(size, name); - if (fence == NULL) + if (!fence) return NULL; atomic_set(&fence->status, num_fences); @@ -313,7 +313,7 @@ struct sync_fence *sync_fence_merge(const char *name, EXPORT_SYMBOL(sync_fence_merge); int sync_fence_wake_up_wq(wait_queue_t *curr, unsigned mode, - int wake_flags, void *key) + int wake_flags, void *key) { struct sync_fence_waiter *wait; @@ -353,7 +353,7 @@ int sync_fence_wait_async(struct sync_fence *fence, EXPORT_SYMBOL(sync_fence_wait_async); int sync_fence_cancel_async(struct sync_fence *fence, - struct sync_fence_waiter *waiter) + struct sync_fence_waiter *waiter) { unsigned long flags; int ret = 0; @@ -583,14 +583,14 @@ static long sync_fence_ioctl_merge(struct sync_fence *fence, unsigned long arg) } fence2 = sync_fence_fdget(data.fd2); - if (fence2 == NULL) { + if (!fence2) { err = -ENOENT; goto err_put_fd; } data.name[sizeof(data.name) - 1] = '\0'; fence3 = sync_fence_merge(data.name, fence, fence2); - if (fence3 == NULL) { + if (!fence3) { err = -ENOMEM; goto err_put_fence2; } @@ -666,7 +666,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence *fence, size = 4096; data = kzalloc(size, GFP_KERNEL); - if (data == NULL) + if (!data) return -ENOMEM; strlcpy(data->name, fence->name, sizeof(data->name)); -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] fix android/sync.h several coding style issues 2015-08-25 6:53 ` [PATCH 4/6] fix android/sync.c " Peng Sun @ 2015-08-25 6:53 ` Peng Sun 2015-08-25 6:53 ` [PATCH 6/6] fix android/timed_gpio.c " Peng Sun 0 siblings, 1 reply; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) spinlock_t definition without comment 2) Alignment should match open parenthesis Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/sync.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index 61f8a3a..87358d2 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -94,12 +94,11 @@ struct sync_timeline { const struct sync_timeline_ops *ops; char name[32]; - /* protected by child_list_lock */ bool destroyed; int context, value; struct list_head child_list_head; - spinlock_t child_list_lock; + spinlock_t child_list_lock; /* protect destroyed */ struct list_head active_list_head; @@ -351,6 +350,6 @@ void sync_dump(void); # define sync_dump() #endif int sync_fence_wake_up_wq(wait_queue_t *curr, unsigned mode, - int wake_flags, void *key); + int wake_flags, void *key); #endif /* _LINUX_SYNC_H */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] fix android/timed_gpio.c several coding style issues 2015-08-25 6:53 ` [PATCH 5/6] fix android/sync.h " Peng Sun @ 2015-08-25 6:53 ` Peng Sun 0 siblings, 0 replies; 8+ messages in thread From: Peng Sun @ 2015-08-25 6:53 UTC (permalink / raw) To: gregkh, arve, riandrews; +Cc: devel, linux-kernel, Peng Sun Corrections based on checkpatch.pl with --strict 1) Please don't use multiple blank lines 2) spinlock_t definition without comment 3) Alignment should match open parenthesis Signed-off-by: Peng Sun <sironhide0null@gmail.com> --- drivers/staging/android/timed_gpio.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index ce11726..33acbbe 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/drivers/staging/android/timed_gpio.c @@ -25,11 +25,10 @@ #include "timed_output.h" #include "timed_gpio.h" - struct timed_gpio_data { struct timed_output_dev dev; struct hrtimer timer; - spinlock_t lock; + spinlock_t lock; /* protect structure fields */ unsigned gpio; int max_timeout; u8 active_low; @@ -76,8 +75,9 @@ static void gpio_enable(struct timed_output_dev *dev, int value) value = data->max_timeout; hrtimer_start(&data->timer, - ktime_set(value / 1000, (value % 1000) * 1000000), - HRTIMER_MODE_REL); + ktime_set(value / 1000, (value % 1000) * + 1000000), + HRTIMER_MODE_REL); } spin_unlock_irqrestore(&data->lock, flags); @@ -94,8 +94,9 @@ static int timed_gpio_probe(struct platform_device *pdev) return -EBUSY; gpio_data = devm_kzalloc(&pdev->dev, - sizeof(struct timed_gpio_data) * pdata->num_gpios, - GFP_KERNEL); + sizeof(struct timed_gpio_data) * + pdata->num_gpios, + GFP_KERNEL); if (!gpio_data) return -ENOMEM; @@ -104,7 +105,7 @@ static int timed_gpio_probe(struct platform_device *pdev) gpio_dat = &gpio_data[i]; hrtimer_init(&gpio_dat->timer, CLOCK_MONOTONIC, - HRTIMER_MODE_REL); + HRTIMER_MODE_REL); gpio_dat->timer.function = gpio_timer_func; spin_lock_init(&gpio_dat->lock); -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/6] fix drivers/staging/android several coding issues 2015-08-25 6:53 [PATCH 0/6] fix drivers/staging/android several coding issues Peng Sun 2015-08-25 6:53 ` [PATCH 1/6] fix android/ashmem.c several coding style issues Peng Sun @ 2015-08-25 15:18 ` Joe Perches 1 sibling, 0 replies; 8+ messages in thread From: Joe Perches @ 2015-08-25 15:18 UTC (permalink / raw) To: Peng Sun; +Cc: gregkh, arve, riandrews, devel, linux-kernel On Tue, 2015-08-25 at 14:53 +0800, Peng Sun wrote: > patches based on linux-next next-20150824 > Corrections based on checkpatch.pl with --strict > > Peng Sun (6): > fix android/ashmem.c several coding style issues > fix android/lowmemorykiller.c several coding style issues > fix android/sw_sync.c several coding style issues > fix android/sync.c several coding style issues > fix android/sync.h several coding style issues > fix android/timed_gpio.c several coding style issues Most here would rather you submit multiple patches by fix type rather than sending patches with multiple fix types per file. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-08-25 15:18 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-08-25 6:53 [PATCH 0/6] fix drivers/staging/android several coding issues Peng Sun 2015-08-25 6:53 ` [PATCH 1/6] fix android/ashmem.c several coding style issues Peng Sun 2015-08-25 6:53 ` [PATCH 2/6] fix android/lowmemorykiller.c " Peng Sun 2015-08-25 6:53 ` [PATCH 3/6] fix android/sw_sync.c " Peng Sun 2015-08-25 6:53 ` [PATCH 4/6] fix android/sync.c " Peng Sun 2015-08-25 6:53 ` [PATCH 5/6] fix android/sync.h " Peng Sun 2015-08-25 6:53 ` [PATCH 6/6] fix android/timed_gpio.c " Peng Sun 2015-08-25 15:18 ` [PATCH 0/6] fix drivers/staging/android several coding issues Joe Perches
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox