[PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Subsystems: staging subsystem, the rest

STALE3372d

9 messages, 3 authors, 2017-06-14 · open the first message on its own page

[PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: srishti sharma <hidden>
Date: 2017-06-09 21:07:28

Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
+			       struct snd_ctl_elem_value *ucontrol)
 {
	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
	int changed = 0;
--
2.7.4

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: Greg KH <gregkh@linuxfoundation.org>
Date: 2017-06-13 13:00:16

On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted hunk
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
+			       struct snd_ctl_elem_value *ucontrol)
 {
	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
	int changed = 0;
This patch is corrupted and can not be applied :(

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: srishti sharma <hidden>
Date: 2017-06-13 14:37:17

On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?

Regards,
Srishti

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: Dan Carpenter <hidden>
Date: 2017-06-13 14:48:41

On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
	int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: srishti sharma <hidden>
Date: 2017-06-13 21:45:14

On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter [off-list ref] wrote:
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

        struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
        int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX

I think this was produced because of running ./scripts/cleanfile on the patch .
I was using this to fix trailing whitespaces . So, I used a different
method to remove them and didn't get that error.

But now when I run 'git am' I get a different error:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:105

Why am I getting this error ?

Regards,
Srishti

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: Greg KH <gregkh@linuxfoundation.org>
Date: 2017-06-14 05:09:54

On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter [off-list ref] wrote:
quoted
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

        struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
        int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX
Exactly.
I think this was produced because of running ./scripts/cleanfile on the patch .
Why would you do that?  By doing that you corrupted the patch file :(

Just use the proper output of 'git format-patch' and all will be fine.

thanks,

greg k-h

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: srishti sharma <hidden>
Date: 2017-06-14 13:41:04

On Wed, Jun 14, 2017 at 10:39 AM, Greg KH [off-list ref] wrote:
On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter [off-list ref] wrote:
quoted
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

        struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
        int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX
Exactly.
quoted
I think this was produced because of running ./scripts/cleanfile on the patch .
Why would you do that?  By doing that you corrupted the patch file :(
After I run ./scritps/checkpatch.pl on the patch produced by git
format-patch it has trailing whitespaces . So I was using
./scripts/cleanfile to fix that , I am not doing that anymore and am
also not getting the corrupt patch error .
Just use the proper output of 'git format-patch' and all will be fine.
I have done this and am still getting these errors:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105

error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
patch does not apply


Why is it not applying ?

Regards,
Srishti

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: Greg KH <gregkh@linuxfoundation.org>
Date: 2017-06-14 13:50:02

On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote:
On Wed, Jun 14, 2017 at 10:39 AM, Greg KH [off-list ref] wrote:
quoted
On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter [off-list ref] wrote:
quoted
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

        struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
        int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX
Exactly.
quoted
I think this was produced because of running ./scripts/cleanfile on the patch .
Why would you do that?  By doing that you corrupted the patch file :(
After I run ./scritps/checkpatch.pl on the patch produced by git
format-patch it has trailing whitespaces . So I was using
./scripts/cleanfile to fix that , I am not doing that anymore and am
also not getting the corrupt patch error .
That means your code had trailing whitespaces, always fix that and NEVER
hand-edit or modify a patch unless you really know what you are doing.
quoted
Just use the proper output of 'git format-patch' and all will be fine.
I have done this and am still getting these errors:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105

error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
patch does not apply


Why is it not applying ?
That is up to you to figure out, we have no idea as to exactly what you
are doing :)

good luck!

greg k-h

Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

From: srishti sharma <hidden>
Date: 2017-06-14 13:53:14

On Wed, Jun 14, 2017 at 7:19 PM, Greg KH [off-list ref] wrote:
On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote:
quoted
On Wed, Jun 14, 2017 at 10:39 AM, Greg KH [off-list ref] wrote:
quoted
On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter [off-list ref] wrote:
quoted
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
quoted
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH [off-list ref] wrote:
quoted
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
quoted
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <redacted>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+                            struct snd_ctl_elem_value *ucontrol)
 {
      struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
      int changed = 0;
This patch is corrupted and can not be applied :(

Why is this corrupted ?
Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

        struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
        int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX
Exactly.
quoted
I think this was produced because of running ./scripts/cleanfile on the patch .
Why would you do that?  By doing that you corrupted the patch file :(
After I run ./scritps/checkpatch.pl on the patch produced by git
format-patch it has trailing whitespaces . So I was using
./scripts/cleanfile to fix that , I am not doing that anymore and am
also not getting the corrupt patch error .
That means your code had trailing whitespaces, always fix that and NEVER
hand-edit or modify a patch unless you really know what you are doing.
quoted
quoted
Just use the proper output of 'git format-patch' and all will be fine.
I have done this and am still getting these errors:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105

error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
patch does not apply


Why is it not applying ?
That is up to you to figure out, we have no idea as to exactly what you
are doing :)
I guess , I was applying the patch to the same repository I made the
change in :P , I am not getting any errors now .
good luck!

greg k-h
Regards,
Srishti
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help