2014-07-28 23:04:38

by Murilo Opsfelder Araujo

Subject: [PATCH] Staging: android: sync.c: fix missing blank line after declaration

Fix coding style issue.

Signed-off-by: Murilo Opsfelder Araujo <[email protected]>
---
drivers/staging/android/sync.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index e7b2e02..69c16cb 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -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,
};
-
--
1.7.10.4

2014-07-31 00:18:33

by Greg Kroah-Hartman

Subject: Re: [PATCH] Staging: android: sync.c: fix missing blank line after declaration

On Mon, Jul 28, 2014 at 08:03:46PM -0300, Murilo Opsfelder Araujo wrote:
> Fix coding style issue.
>
> Signed-off-by: Murilo Opsfelder Araujo <[email protected]>
> ---
> drivers/staging/android/sync.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> index e7b2e02..69c16cb 100644
> --- a/drivers/staging/android/sync.c
> +++ b/drivers/staging/android/sync.c
> @@ -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,
> };
> -

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

2014-07-31 11:47:45

by Murilo Opsfelder Araujo

Subject: Re: [PATCH] Staging: android: sync.c: fix missing blank line after declaration

On 07/30/2014 09:17 PM, Greg KH wrote:
> 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.

--
Murilo

2014-07-31 22:23:13

by Greg Kroah-Hartman

Subject: Re: [PATCH] Staging: android: sync.c: fix missing blank line after declaration

On Thu, Jul 31, 2014 at 08:47:07AM -0300, Murilo Opsfelder Araujo wrote:
> On 07/30/2014 09:17 PM, Greg KH wrote:
> >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