Skip to contentSkip to conversation

Staging: android: sync.c: fix missing blank line after declaration

PATCH In review Murilo Opsfelder Araujo 2 participants 4 messages Jul 28, 2014 – Jul 31, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: android: sync.c: fix missing blank line after declaration

Fix coding style issue.

---
 drivers/staging/android/sync.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/android/sync.c +1 -1
index e7b2e02..69c16cb 100644
@@ -705,6 +705,7 @@ static long sync_fence_ioctl(struct file *file, unsigned int cmd,
 			     unsigned long arg)
 {
 	struct sync_fence *fence = file->private_data;
+
 	switch (cmd) {
 	case SYNC_IOC_WAIT:
 		return sync_fence_ioctl_wait(fence, arg);
@@ -726,4 +727,3 @@ static const struct file_operations sync_fence_fops = {
 	.unlocked_ioctl = sync_fence_ioctl,
 	.compat_ioctl = sync_fence_ioctl,
 };
-
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw
Quoted 20 lines · Murilo Opsfelder Araujo

Fix coding style issue.

---
 drivers/staging/android/sync.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/android/sync.c +1 -0
index e7b2e02..69c16cb 100644
@@ -705,6 +705,7 @@ static long sync_fence_ioctl(struct file *file, unsigned int cmd,
 			     unsigned long arg)
 {
 	struct sync_fence *fence = file->private_data;
+
 	switch (cmd) {
 	case SYNC_IOC_WAIT:
 		return sync_fence_ioctl_wait(fence, arg);

drivers/staging/android/sync.c static const struct file_operations sync_fence_fops = { · line 729

Quoted 4 lines
drivers/staging/android/sync.c +0 -1
@@ -726,4 +727,3 @@ static const struct file_operations sync_fence_fops = {
 	.unlocked_ioctl = sync_fence_ioctl,
 	.compat_ioctl = sync_fence_ioctl,
 };
-

Also doesn't apply, are you sure you are using the staging-next branch of staging.git on git.kernel.org?

thanks,

greg k-h

#2 lore raw
Quoted 2 lines · Greg KH

Also doesn't apply, are you sure you are using the staging-next branch of staging.git on git.kernel.org?

I was using linux-next, not staging-next. sync.c has no checkpatch.pl warnings in staging-next.

Sorry for the false alarm, guys.

Signature · 1 line
Murilo
maintainer
#3 lore raw
Quoted 8 lines · Murilo Opsfelder Araujo
Quoted 2 lines · Greg KH

Also doesn't apply, are you sure you are using the staging-next branch of staging.git on git.kernel.org?

I was using linux-next, not staging-next. sync.c has no checkpatch.pl warnings in staging-next.

Sorry for the false alarm, guys.

Ah, this is the fun thing where that code is being changed in two different trees. This sometimes happens, sorry about that. Wait for 3.17-rc1 to be out before touching this code again, as that will have everything merged properly in one tree.

Sorry for the confusion.

greg k-h