forked from luck/tmp_suning_uos_patched
bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().
As Stephen Rothwell points out, we don't want 'sock' here but rather we really do want 'sk'. This local var is protected by all sorts of bluetooth debugging kconfig vars, but BT_DBG() is just a straight pr_debug() call which is unconditional. pr_debug() evaluates it's args only if either DEBUG or CONFIG_DYNAMIC_PRINTK_DEBUG is defined. Solving this inside of the BT_DBG() macro is non-trivial since it's varargs. And these ifdefs are ugly. So, just mark this 'sk' thing __maybe_unused and kill the ifdefs. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
bcb09dc276
commit
e19caae717
|
@ -787,12 +787,10 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
|
|||
|
||||
static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
|
||||
struct sock *sk = sock->sk;
|
||||
#endif
|
||||
struct sock *sk __maybe_unused = sock->sk;
|
||||
int err;
|
||||
|
||||
BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
|
||||
BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
|
||||
|
||||
err = bt_sock_ioctl(sock, cmd, arg);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user