Skip to contentSkip to conversation

staging : android : fix checkpatch issues

PATCH In review Daeseok Youn 3 participants 7 messages Feb 10, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging : android : fix checkpatch issues

Quoted 1 line

From 1348300b03697d0499eddba6035a851d1278abd1 Mon Sep 17 00:00:00 2001

From: Daeseok Youn <[email protected]>
Date: Mon, 10 Feb 2014 10:45:30 +0900
Subject: [PATCH] staging : android : fix checkpatch issues

drivers/staging/android/
ion/ion.c :
- WARNNING: Unnecessary space after function pointer name
- ERROR: return is not a function, parentheses are not required
- WARNNING: Prefer seq_puts to seq_printf
- WARNING: quoted string split across lines

ion/ion_priv.h :
- WARNING: Unnecessary space after function pointer name

sync.h :
- WARNING: missing space after return type

timed_output.h :
- WARNING: Multiple spaces after return type

---
 drivers/staging/android/ion/ion.c      |   19 +++++++++----------
 drivers/staging/android/ion/ion_priv.h |   16 ++++++++--------
 drivers/staging/android/sync.h         |    2 +-
 drivers/staging/android/timed_output.h |    4 ++--
 4 files changed, 20 insertions(+), 21 deletions(-)
drivers/staging/android/ion/ion.c +9 -10
index 574066f..d81f231 100644
@@ -55,7 +55,7 @@ struct ion_device {
 	struct mutex buffer_lock;
 	struct rw_semaphore lock;
 	struct plist_head heaps;
-	long (*custom_ioctl) (struct ion_client *client, unsigned int cmd,
+	long (*custom_ioctl)(struct ion_client *client, unsigned int cmd,
 			      unsigned long arg);
 	struct rb_root clients;
 	struct dentry *debug_root;
@@ -429,7 +429,7 @@ static bool ion_handle_validate(struct ion_client *client,
 				struct ion_handle *handle)
 {
 	WARN_ON(!mutex_is_locked(&client->lock));
-	return (idr_find(&client->idr, handle->id) == handle);
+	return idr_find(&client->idr, handle->id) == handle;
 }
 
 static int ion_handle_add(struct ion_client *client, struct ion_handle *handle)
@@ -1338,7 +1338,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 	size_t total_orphaned_size = 0;
 
 	seq_printf(s, "%16.s %16.s %16.s\n", "client", "pid", "size");
-	seq_printf(s, "----------------------------------------------------\n");
+	seq_puts(s, "----------------------------------------------------\n");
 
 	for (n = rb_first(&dev->clients); n; n = rb_next(n)) {
 		struct ion_client *client = rb_entry(n, struct ion_client,
@@ -1357,9 +1357,9 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 				   client->pid, size);
 		}
 	}
-	seq_printf(s, "----------------------------------------------------\n");
-	seq_printf(s, "orphaned allocations (info is from last known client):"
-		   "\n");
+	seq_puts(s, "----------------------------------------------------\n");
+	seq_puts(s, "orphaned allocations (info is from last known client):\n");
+
 	mutex_lock(&dev->buffer_lock);
 	for (n = rb_first(&dev->buffers); n; n = rb_next(n)) {
 		struct ion_buffer *buffer = rb_entry(n, struct ion_buffer,
@@ -1376,14 +1376,14 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 		}
 	}
 	mutex_unlock(&dev->buffer_lock);
-	seq_printf(s, "----------------------------------------------------\n");
+	seq_puts(s, "----------------------------------------------------\n");
 	seq_printf(s, "%16.s %16zu\n", "total orphaned",
 		   total_orphaned_size);
 	seq_printf(s, "%16.s %16zu\n", "total ", total_size);
 	if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)
 		seq_printf(s, "%16.s %16zu\n", "deferred free",
 				heap->free_list_size);
-	seq_printf(s, "----------------------------------------------------\n");
+	seq_puts(s, "----------------------------------------------------\n");
 
 	if (heap->debug_show)
 		heap->debug_show(heap, s, unused);
@@ -1527,8 +1527,7 @@ void __init ion_reserve(struct ion_platform_data *data)
 						    data->heaps[i].align,
 						    MEMBLOCK_ALLOC_ANYWHERE);
 			if (!paddr) {
-				pr_err("%s: error allocating memblock for "
-				       "heap %d\n",
+				pr_err("%s: error allocating memblock for heap %d\n",
 					__func__, i);
 				continue;
 			}
drivers/staging/android/ion/ion_priv.h +8 -8
index d986739..10f315a 100644
@@ -100,18 +100,18 @@ void ion_buffer_destroy(struct ion_buffer *buffer);
  * map_dma and map_kernel return pointer on success, ERR_PTR on error.
  */
 struct ion_heap_ops {
-	int (*allocate) (struct ion_heap *heap,
+	int (*allocate)(struct ion_heap *heap,
 			 struct ion_buffer *buffer, unsigned long len,
 			 unsigned long align, unsigned long flags);
-	void (*free) (struct ion_buffer *buffer);
-	int (*phys) (struct ion_heap *heap, struct ion_buffer *buffer,
+	void (*free)(struct ion_buffer *buffer);
+	int (*phys)(struct ion_heap *heap, struct ion_buffer *buffer,
 		     ion_phys_addr_t *addr, size_t *len);
-	struct sg_table *(*map_dma) (struct ion_heap *heap,
+	struct sg_table * (*map_dma)(struct ion_heap *heap,
 					struct ion_buffer *buffer);
-	void (*unmap_dma) (struct ion_heap *heap, struct ion_buffer *buffer);
-	void * (*map_kernel) (struct ion_heap *heap, struct ion_buffer *buffer);
-	void (*unmap_kernel) (struct ion_heap *heap, struct ion_buffer *buffer);
-	int (*map_user) (struct ion_heap *mapper, struct ion_buffer *buffer,
+	void (*unmap_dma)(struct ion_heap *heap, struct ion_buffer *buffer);
+	void * (*map_kernel)(struct ion_heap *heap, struct ion_buffer *buffer);
+	void (*unmap_kernel)(struct ion_heap *heap, struct ion_buffer *buffer);
+	int (*map_user)(struct ion_heap *mapper, struct ion_buffer *buffer,
 			 struct vm_area_struct *vma);
 };
 
drivers/staging/android/sync.h +1 -1
index 62e2255b..6ee8d69 100644
@@ -53,7 +53,7 @@ struct sync_timeline_ops {
 	const char *driver_name;
 
 	/* required */
-	struct sync_pt *(*dup)(struct sync_pt *pt);
+	struct sync_pt * (*dup)(struct sync_pt *pt);
 
 	/* required */
 	int (*has_signaled)(struct sync_pt *pt);
drivers/staging/android/timed_output.h +2 -2
index 905c7cc..13d2ca5 100644
@@ -20,10 +20,10 @@ struct timed_output_dev {
 	const char	*name;
 
 	/* enable the output and set the timer */
-	void	(*enable)(struct timed_output_dev *sdev, int timeout);
+	void (*enable)(struct timed_output_dev *sdev, int timeout);
 
 	/* returns the current number of milliseconds remaining on the timer */
-	int		(*get_time)(struct timed_output_dev *sdev);
+	int (*get_time)(struct timed_output_dev *sdev);
 
 	/* private data */
 	struct device	*dev;
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 12 lines · Daeseok Youn
Quoted 1 line

From 1348300b03697d0499eddba6035a851d1278abd1 Mon Sep 17 00:00:00 2001

From: Daeseok Youn <[email protected]>
Date: Mon, 10 Feb 2014 10:45:30 +0900
Subject: [PATCH] staging : android : fix checkpatch issues

drivers/staging/android/
ion/ion.c :
- WARNNING: Unnecessary space after function pointer name
- ERROR: return is not a function, parentheses are not required
- WARNNING: Prefer seq_puts to seq_printf
- WARNING: quoted string split across lines

Quoted 8 lines

ion/ion_priv.h :
- WARNING: Unnecessary space after function pointer name

sync.h :
- WARNING: missing space after return type

timed_output.h :
- WARNING: Multiple spaces after return type

You are doing multiple things in different files, please break this up into smaller patches...

thanks,

greg k-h

#2 lore raw

2014-02-10 13:26 GMT+09:00 Greg KH <[email protected]>:

Quoted 22 lines · Daeseok Youn
Quoted 12 lines
Quoted 1 line

From 1348300b03697d0499eddba6035a851d1278abd1 Mon Sep 17 00:00:00 2001

From: Daeseok Youn <[email protected]>
Date: Mon, 10 Feb 2014 10:45:30 +0900
Subject: [PATCH] staging : android : fix checkpatch issues

drivers/staging/android/
ion/ion.c :
- WARNNING: Unnecessary space after function pointer name
- ERROR: return is not a function, parentheses are not required
- WARNNING: Prefer seq_puts to seq_printf
- WARNING: quoted string split across lines

Quoted 8 lines

ion/ion_priv.h :
- WARNING: Unnecessary space after function pointer name

sync.h :
- WARNING: missing space after return type

timed_output.h :
- WARNING: Multiple spaces after return type

Quoted 6 lines

You are doing multiple things in different files, please break this up into smaller patches...

thanks,

greg k-h

Yes, I will break this into smaller patches and re-send. Thanks.

Daeseok Youn

#3 lore raw
In reply to Daeseok Youn

drivers/staging/android/ion/ion.c static int ion_debug_heap_show(struct seq_file *s, void *unused) · line 1381

Quoted 8 lines · Daeseok Youn
drivers/staging/android/ion/ion.c +1 -1
@@ -1376,14 +1376,14 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 		}
 	}
 	mutex_unlock(&dev->buffer_lock);
-	seq_printf(s, "----------------------------------------------------\n");
+	seq_puts(s, "----------------------------------------------------\n");
 	seq_printf(s, "%16.s %16zu\n", "total orphaned",
 		   total_orphaned_size);

This kind of thing where you put a seq_puts() in the middle of a string of seq_printf() calls is not good. We only make checkpatch.pl warn about it to see if patch submitters are paying attention and to test the patience of reviewers.

regards,
dan carpenter

#4 lore raw

Thanks for reviewing.

Yes, I just followed by reports of checkpatch.pl.

But I don't understand why I can use of seq_puts() in the middle of seq_printf() calls.
I have been trying to search why that is not good but I didn't find anything about that.
And I saw patches which were already merged similar with this patch.

You can see with this url
https://github.com/torvalds/linux/commit/2d219c518882d2b2bac77742a6a8979c9dad051a
https://github.com/mirrors/linux-2.6/commit/7aff38176e79a22b1749c2af74060028298e6a45

If you don't mind, let me know why it is not good.

Thanks.
Daeseok Youn

2014-02-10 18:11 GMT+09:00 Dan Carpenter <[email protected]>:

Quoted 18 lines · Daeseok Youn

drivers/staging/android/ion/ion.c static int ion_debug_heap_show(struct seq_file *s, void *unused) · line 1381

Quoted 8 lines
drivers/staging/android/ion/ion.c +1 -1
@@ -1376,14 +1376,14 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
              }
      }
      mutex_unlock(&dev->buffer_lock);
-     seq_printf(s, "----------------------------------------------------\n");
+     seq_puts(s, "----------------------------------------------------\n");
      seq_printf(s, "%16.s %16zu\n", "total orphaned",
                 total_orphaned_size);

This kind of thing where you put a seq_puts() in the middle of a string of seq_printf() calls is not good. We only make checkpatch.pl warn about it to see if patch submitters are paying attention and to test the patience of reviewers.

regards,
dan carpenter

#5 lore raw
Quoted 10 lines · DaeSeok Youn

Thanks for reviewing.

Yes, I just followed by reports of checkpatch.pl.

But I don't understand why I can use of seq_puts() in the middle of seq_printf() calls.
I have been trying to search why that is not good but I didn't find anything about that.
And I saw patches which were already merged similar with this patch.

Quoted 5 lines

You can see with this url
https://github.com/torvalds/linux/commit/2d219c518882d2b2bac77742a6a8979c9dad051a
https://github.com/mirrors/linux-2.6/commit/7aff38176e79a22b1749c2af74060028298e6a45

If you don't mind, let me know why it is not good.

Because it doesn't look nice. It messes up the alignment.

Checkpatch is a tool not a king of the world. Stop obeying checkpatch.

regards,
dan carpenter

#6 lore raw

OK. I will re-send this patch except replacing seq_printf() with seq_puts(). Your review helped me a lot.

Thanks.
Daeseok Youn.

2014-02-10 19:52 GMT+09:00 Dan Carpenter <[email protected]>:

Quoted 24 lines · DaeSeok Youn
Quoted 10 lines

Thanks for reviewing.

Yes, I just followed by reports of checkpatch.pl.

But I don't understand why I can use of seq_puts() in the middle of seq_printf() calls.
I have been trying to search why that is not good but I didn't find anything about that.
And I saw patches which were already merged similar with this patch.

Quoted 5 lines

You can see with this url
https://github.com/torvalds/linux/commit/2d219c518882d2b2bac77742a6a8979c9dad051a
https://github.com/mirrors/linux-2.6/commit/7aff38176e79a22b1749c2af74060028298e6a45

If you don't mind, let me know why it is not good.

Because it doesn't look nice. It messes up the alignment.

Checkpatch is a tool not a king of the world. Stop obeying checkpatch.

regards,
dan carpenter