Skip to contentSkip to conversation

staging: android: ashmem.c: fix several coding style issues

PATCH New Peng Sun 1 participant 4 messages Aug 27, 2015 Staging

lore
Share & tools
lore

Peng Sun

author
#0 lore raw

cover staging: android: ashmem.c: fix several coding style issues

patches based on linux-next next-20150826
Corrections based on checkpatch.pl with --strict

Peng Sun (3):
staging: android: ashmem.c: 'spaces preferred around that -' style
issue
staging: android: ashmem.c: 'No space necessary after' style issue
staging: android: ashmem.c: 'Alignment' style issue

 drivers/staging/android/ashmem.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--
1.9.1

author
#1 lore raw

PATCH 1/3 staging: android: ashmem.c: 'spaces preferred around that -' style issue

fix a CHECK style issue by checkpatch.pl with --strict:
spaces preferred around that '-'

---
 drivers/staging/android/ashmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +2 -1
index 60200a3..b340ddc 100644
@@ -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;
 			}
 
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/3 staging: android: ashmem.c: 'No space necessary after' style issue

In reply to Peng Sun

fix two CHECK issues by checkpatch.pl with --strict:
No space is necessary after a cast

---
 drivers/staging/android/ashmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/android/ashmem.c +2 -2
index b340ddc..1312600 100644
@@ -716,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))
@@ -760,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:
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 3/3 staging: android: ashmem.c: 'Alignment' style issue

In reply to Peng Sun

fix two CHECK issues by checkpatch.pl with --strict:
Alignment should match open parenthesis

---
 drivers/staging/android/ashmem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/android/ashmem.c +4 -4
index 1312600..d786ec1 100644
@@ -834,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;
Signature · 1 line
1.9.1