* [PATCH] Bluetooth: af_bluetooth: checkpatch: fix indentation and alignment
@ 2021-01-27 15:05 Tomoyuki Matsushita
2021-01-27 20:03 ` Joe Perches
0 siblings, 1 reply; 2+ messages in thread
From: Tomoyuki Matsushita @ 2021-01-27 15:05 UTC (permalink / raw)
To: marcel, johan.hedberg, luiz.dentz, davem, kuba
Cc: Tomoyuki Matsushita, linux-bluetooth, netdev, linux-kernel
Signed-off-by: Tomoyuki Matsushita <xorphitus@fastmail.com>
---
net/bluetooth/af_bluetooth.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 4ef6a54403aa..968ea03d863f 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -72,8 +72,8 @@ void bt_sock_reclassify_lock(struct sock *sk, int proto)
BUG_ON(!sock_allow_reclassification(sk));
sock_lock_init_class_and_name(sk,
- bt_slock_key_strings[proto], &bt_slock_key[proto],
- bt_key_strings[proto], &bt_lock_key[proto]);
+ bt_slock_key_strings[proto], &bt_slock_key[proto],
+ bt_key_strings[proto], &bt_lock_key[proto]);
}
EXPORT_SYMBOL(bt_sock_reclassify_lock);
@@ -451,7 +451,7 @@ static inline __poll_t bt_accept_poll(struct sock *parent)
}
__poll_t bt_sock_poll(struct file *file, struct socket *sock,
- poll_table *wait)
+ poll_table *wait)
{
struct sock *sk = sock->sk;
__poll_t mask = 0;
@@ -478,7 +478,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
mask |= EPOLLHUP;
if (sk->sk_state == BT_CONNECT ||
- sk->sk_state == BT_CONNECT2 ||
+ sk->sk_state == BT_CONNECT2 ||
sk->sk_state == BT_CONFIG)
return mask;
@@ -508,7 +508,7 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
if (amount < 0)
amount = 0;
- err = put_user(amount, (int __user *) arg);
+ err = put_user(amount, (int __user *)arg);
break;
case TIOCINQ:
@@ -519,7 +519,7 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
skb = skb_peek(&sk->sk_receive_queue);
amount = skb ? skb->len : 0;
release_sock(sk);
- err = put_user(amount, (int __user *) arg);
+ err = put_user(amount, (int __user *)arg);
break;
default:
@@ -637,7 +637,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
if (v == SEQ_START_TOKEN) {
- seq_puts(seq ,"sk RefCnt Rmem Wmem User Inode Parent");
+ seq_puts(seq, "sk RefCnt Rmem Wmem User Inode Parent");
if (l->custom_seq_show) {
seq_putc(seq, ' ');
@@ -657,7 +657,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
sk_wmem_alloc_get(sk),
from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
sock_i_ino(sk),
- bt->parent? sock_i_ino(bt->parent): 0LU);
+ bt->parent ? sock_i_ino(bt->parent) : 0LU);
if (l->custom_seq_show) {
seq_putc(seq, ' ');
@@ -678,7 +678,7 @@ static const struct seq_operations bt_seq_ops = {
int bt_procfs_init(struct net *net, const char *name,
struct bt_sock_list *sk_list,
- int (* seq_show)(struct seq_file *, void *))
+ int (*seq_show)(struct seq_file *, void *))
{
sk_list->custom_seq_show = seq_show;
@@ -694,7 +694,7 @@ void bt_procfs_cleanup(struct net *net, const char *name)
#else
int bt_procfs_init(struct net *net, const char *name,
struct bt_sock_list *sk_list,
- int (* seq_show)(struct seq_file *, void *))
+ int (*seq_show)(struct seq_file *, void *))
{
return 0;
}
--
2.30.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Bluetooth: af_bluetooth: checkpatch: fix indentation and alignment
2021-01-27 15:05 [PATCH] Bluetooth: af_bluetooth: checkpatch: fix indentation and alignment Tomoyuki Matsushita
@ 2021-01-27 20:03 ` Joe Perches
0 siblings, 0 replies; 2+ messages in thread
From: Joe Perches @ 2021-01-27 20:03 UTC (permalink / raw)
To: Tomoyuki Matsushita, marcel, johan.hedberg, luiz.dentz, davem, kuba
Cc: linux-bluetooth, netdev, linux-kernel
On Thu, 2021-01-28 at 00:05 +0900, Tomoyuki Matsushita wrote:
> Signed-off-by: Tomoyuki Matsushita <xorphitus@fastmail.com>
checkpatch is pretty stupid so whatever it recommends needs to
be looked at carefully by a human and fixed appropriately.
> diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
[]
> @@ -478,7 +478,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
> mask |= EPOLLHUP;
>
>
> if (sk->sk_state == BT_CONNECT ||
> - sk->sk_state == BT_CONNECT2 ||
> + sk->sk_state == BT_CONNECT2 ||
> sk->sk_state == BT_CONFIG)
checkpatch only warns on the alignment of the second line of multi-line statements.
Please make sure all lines of the multi-line statements are aligned.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-27 20:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 15:05 [PATCH] Bluetooth: af_bluetooth: checkpatch: fix indentation and alignment Tomoyuki Matsushita
2021-01-27 20:03 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).