2015-06-19 05:15:18

by Mutharaju, Prasanna (P.)

[permalink] [raw]
Subject: [PATCH] Bluetooth:hci_bcsp:Fix coding style -- Clean up

From: Prasanna Karthik <[email protected]>

Space prohibited between function name and open parenthesis '('
reported by Checkpatch

Signed-off-by: Prasanna Karthik <[email protected]>
---
drivers/bluetooth/hci_bcsp.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index dc8e3d4..9b8233b 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -464,7 +464,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_str=
uct *bcsp, unsigned char
break;
=20
default:
- BT_ERR ("Invalid byte %02x after esc byte", byte);
+ BT_ERR("Invalid byte %02x after esc byte", byte);
kfree_skb(bcsp->rx_skb);
bcsp->rx_skb =3D NULL;
bcsp->rx_state =3D BCSP_W4_PKT_DELIMITER;
@@ -527,7 +527,7 @@ static void bcsp_complete_rx_pkt(struct hci_uart *hu)
=20
hci_recv_frame(hu->hdev, bcsp->rx_skb);
} else {
- BT_ERR ("Packet for unknown channel (%u %s)",
+ BT_ERR("Packet for unknown channel (%u %s)",
bcsp->rx_skb->data[1] & 0x0f,
bcsp->rx_skb->data[0] & 0x80 ?=20
"reliable" : "unreliable");
@@ -587,7 +587,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *d=
ata, int count)
}
if (bcsp->rx_skb->data[0] & 0x80 /* reliable pkt */
&& (bcsp->rx_skb->data[0] & 0x07) !=3D bcsp->rxseq_txack) {
- BT_ERR ("Out-of-order packet arrived, got %u expected %u",
+ BT_ERR("Out-of-order packet arrived, got %u expected %u",
bcsp->rx_skb->data[0] & 0x07, bcsp->rxseq_txack);
=20
kfree_skb(bcsp->rx_skb);
@@ -610,7 +610,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *d=
ata, int count)
=20
case BCSP_W4_CRC:
if (bitrev16(bcsp->message_crc) !=3D bscp_get_crc(bcsp)) {
- BT_ERR ("Checksum failed: computed %04x received %04x",
+ BT_ERR("Checksum failed: computed %04x received %04x",
bitrev16(bcsp->message_crc),
bscp_get_crc(bcsp));
=20
--=20
1.7.0.4


2015-06-20 12:21:39

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth:hci_bcsp:Fix coding style -- Clean up

Hi Prasanna,

On Fri, Jun 19, 2015, Mutharaju, Prasanna (P.) wrote:
> On Fri, Jun 19, 2015 at 11:20:43AM +0200, Marcel Holtmann wrote:
> > Hi Prasanna,
> >
> > > Space prohibited between function name and open parenthesis '('
> > > reported by Checkpatch
> > >
> > > Signed-off-by: Prasanna Karthik <[email protected]>
> > > ---
> > > drivers/bluetooth/hci_bcsp.c | 8 ++++----
> > > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > I got a malformed patch on my side. I can not apply it with git am.
> >
> > Regards
> >
> > Marcel
> >
> Hey Marcel,
>
> I see git am applies fine on my branch. Actually, Fix is for Space warning and not
> intended for lines > 80 chars. Any suggestions ?

No direct suggestions, but there is definitely something wrong with the
patch since I'm unable to apply it as well:

Applying: Bluetooth:hci_bcsp:Fix coding style -- Clean up
/home/jh/src/linux/.git/rebase-apply/patch:25: trailing whitespace.
bcsp->rx_skb->data[0] & 0x80 ?
/home/jh/src/linux/.git/rebase-apply/patch:30: space before tab in indent.
&& (bcsp->rx_skb->data[0] & 0x07) != bcsp->rxseq_txack) {
error: patch failed: drivers/bluetooth/hci_bcsp.c:464
error: drivers/bluetooth/hci_bcsp.c: patch does not apply
Patch failed at 0001 Bluetooth:hci_bcsp:Fix coding style -- Clean up

Johan

2015-06-19 09:55:08

by Mutharaju, Prasanna (P.)

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth:hci_bcsp:Fix coding style -- Clean up

On Fri, Jun 19, 2015 at 11:20:43AM +0200, Marcel Holtmann wrote:
> Hi Prasanna,
>=20
> > Space prohibited between function name and open parenthesis '('
> > reported by Checkpatch
> >=20
> > Signed-off-by: Prasanna Karthik <[email protected]>
> > ---
> > drivers/bluetooth/hci_bcsp.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
>=20
> I got a malformed patch on my side. I can not apply it with git am.
>=20
> Regards
>=20
> Marcel
>=20
Hey Marcel,

I see git am applies fine on my branch. Actually, Fix is for Space warning =
and not=20
intended for lines > 80 chars. Any suggestions ?

Thanks=

2015-06-19 09:20:43

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth:hci_bcsp:Fix coding style -- Clean up

Hi Prasanna,

> Space prohibited between function name and open parenthesis '('
> reported by Checkpatch
>
> Signed-off-by: Prasanna Karthik <[email protected]>
> ---
> drivers/bluetooth/hci_bcsp.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)

I got a malformed patch on my side. I can not apply it with git am.

Regards

Marcel