Skip to content

Commit e19caae

Browse files
committed
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>
1 parent bcb09dc commit e19caae

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

net/bluetooth/rfcomm/sock.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,12 +787,10 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
787787

788788
static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
789789
{
790-
#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
791-
struct sock *sk = sock->sk;
792-
#endif
790+
struct sock *sk __maybe_unused = sock->sk;
793791
int err;
794792

795-
BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
793+
BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
796794

797795
err = bt_sock_ioctl(sock, cmd, arg);
798796

0 commit comments

Comments
 (0)