summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-09 01:04:27 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-09 01:04:27 -0800
commite19caae7177fcc732ae1b47135e39f577352adb2 (patch)
treef212c02bd6888bc6c4a30db6ab3278f365a6fccc /net/bluetooth
parentbcb09dc276e706ed6f22813ba774797125f3da0a (diff)
downloadop-kernel-dev-e19caae7177fcc732ae1b47135e39f577352adb2.zip
op-kernel-dev-e19caae7177fcc732ae1b47135e39f577352adb2.tar.gz
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/rfcomm/sock.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ffaa6b0..d3fc6fc 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -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);
OpenPOWER on IntegriCloud