Skip to contentSkip to conversation

Staging: dream: pmem: fix some code style issues

PATCH Superseded Chihau Chau 3 participants 3 messages Mar 1, 2010 – Apr 8, 2010 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: dream: pmem: fix some code style issues

From: Chihau Chau <[email protected]>

This fixes some code style issues like some braces {} deleted becouse are not necessary for a single statement blocks and to include KERN_ facility level in the printk() functions.

---
 drivers/staging/dream/pmem.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/dream/pmem.c +9 -9
index def6468..d8b5cb0 100644
@@ -708,9 +708,8 @@ int get_pmem_addr(struct file *file, unsigned long *start,
 	struct pmem_data *data;
 	int id;
 
-	if (!is_pmem_file(file) || !has_allocation(file)) {
+	if (!is_pmem_file(file) || !has_allocation(file))
 		return -1;
-	}
 
 	data = (struct pmem_data *)file->private_data;
 	if (data->index == -1) {
@@ -789,9 +788,8 @@ void flush_pmem_file(struct file *file, unsigned long offset, unsigned long len)
 	struct list_head *elt;
 	void *flush_start, *flush_end;
 
-	if (!is_pmem_file(file) || !has_allocation(file)) {
+	if (!is_pmem_file(file) || !has_allocation(file))
 		return;
-	}
 
 	id = get_id(file);
 	data = (struct pmem_data *)file->private_data;
@@ -833,7 +831,7 @@ static int pmem_connect(unsigned long connect, struct file *file)
 	src_file = fget_light(connect, &put_needed);
 	DLOG("connect %p to %p\n", file, src_file);
 	if (!src_file) {
-		printk("pmem: src file not found!\n");
+		printk(KERN_ERR "pmem: src file not found!\n");
 		ret = -EINVAL;
 		goto err_no_file;
 	}
@@ -936,8 +934,8 @@ int pmem_remap(struct pmem_region *region, struct file *file,
 	if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) ||
 		 !PMEM_IS_PAGE_ALIGNED(region->len))) {
 #if PMEM_DEBUG
-		printk("pmem: request for unaligned pmem suballocation "
-		       "%lx %lx\n", region->offset, region->len);
+		printk(KERN_ERR "pmem: request for unaligned pmem "
+			"suballocation %lx %lx\n", region->offset, region->len);
 #endif
 		return -EINVAL;
 	}
@@ -1087,8 +1085,10 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				region.offset = pmem_start_addr(id, data);
 				region.len = pmem_len(id, data);
 			}
-			printk(KERN_INFO "pmem: request for physical address of pmem region "
-					"from process %d.\n", current->pid);
+			printk(KERN_INFO "pmem: request for physical address "
+					"of pmem region from process %d.\n",
+								current->pid);
+
 			if (copy_to_user((void __user *)arg, &region,
 						sizeof(struct pmem_region)))
 				return -EFAULT;
Signature · 1 line
1.5.6.3
#1 lore raw
Quoted 5 lines · Chihau Chau

From: Chihau Chau <[email protected]>

This fixes some code style issues like some braces {} deleted becouse are not necessary for a single statement blocks and to include KERN_ facility level in the printk() functions.

Most of patch is good, but...

drivers/staging/dream/pmem.c int pmem_remap(struct pmem_region *region, struct file *file, · line 941

Quoted 11 lines
drivers/staging/dream/pmem.c +2 -2
@@ -936,8 +934,8 @@ int pmem_remap(struct pmem_region *region, struct file *file,
 	if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) ||
 		 !PMEM_IS_PAGE_ALIGNED(region->len))) {
 #if PMEM_DEBUG
-		printk("pmem: request for unaligned pmem suballocation "
-		       "%lx %lx\n", region->offset, region->len);
+		printk(KERN_ERR "pmem: request for unaligned pmem "
+			"suballocation %lx %lx\n", region->offset, region->len);
 #endif
 		return -EINVAL;
 	}

This is strange. If it is debuging print, should it be KERN_DEBUG? And we have nice dev_dbg macros for just that, so that ifdef is not neccessarry.

drivers/staging/dream/pmem.c static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 1091

Quoted 10 lines
drivers/staging/dream/pmem.c +4 -2
@@ -1087,8 +1085,10 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				region.offset = pmem_start_addr(id, data);
 				region.len = pmem_len(id, data);
 			}
-			printk(KERN_INFO "pmem: request for physical address of pmem region "
-					"from process %d.\n", current->pid);
+			printk(KERN_INFO "pmem: request for physical address "
+					"of pmem region from process %d.\n",
+								current->pid);
+

And this gets code worse, not better.

(Feel free to send all the other hunks with my ACK.)
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw

Re: staging: dream: pmem: fix some code style issues

In reply to Chihau Chau
Quoted 7 lines · Chihau Chau

From: Chihau Chau <[email protected]>

This fixes some code style issues like some braces {} deleted becouse are not necessary for a single statement blocks and to include KERN_ facility level in the printk() functions.

Sorry, someone else already did this change to the tree.

greg k-h