aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-05-21 08:47:46 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-04 23:34:06 -0400
commit401bb1f768c842b9fbfaeb7741cc5cf17c70ffd1 (patch)
tree26cc24b76bbb3fae76b446edf6709e5ed97c014e
parentee556f662ca9e96a3cdb0d10745f9fd0cbf549af (diff)
Bluetooth: Silent sparse warnings
Silence warnings below: net/bluetooth/l2cap_core.c:1662:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1662:27: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1683:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:1683:27: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2260:46: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2574:33: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:2581:33: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:4556:24: warning: Using plain integer as NULL pointer net/bluetooth/l2cap_core.c:4556:27: warning: Using plain integer as NULL pointer Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--net/bluetooth/l2cap_core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ae69da8d01e7..c85a3a2a37bf 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1659,7 +1659,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
1659 return; 1659 return;
1660 } 1660 }
1661 1661
1662 l2cap_tx(chan, 0, 0, L2CAP_EV_MONITOR_TO); 1662 l2cap_tx(chan, NULL, NULL, L2CAP_EV_MONITOR_TO);
1663 1663
1664 l2cap_chan_unlock(chan); 1664 l2cap_chan_unlock(chan);
1665 l2cap_chan_put(chan); 1665 l2cap_chan_put(chan);
@@ -1680,7 +1680,7 @@ static void l2cap_retrans_timeout(struct work_struct *work)
1680 return; 1680 return;
1681 } 1681 }
1682 1682
1683 l2cap_tx(chan, 0, 0, L2CAP_EV_RETRANS_TO); 1683 l2cap_tx(chan, NULL, NULL, L2CAP_EV_RETRANS_TO);
1684 l2cap_chan_unlock(chan); 1684 l2cap_chan_unlock(chan);
1685 l2cap_chan_put(chan); 1685 l2cap_chan_put(chan);
1686} 1686}
@@ -2257,7 +2257,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
2257 break; 2257 break;
2258 2258
2259 if (chan->mode == L2CAP_MODE_ERTM) 2259 if (chan->mode == L2CAP_MODE_ERTM)
2260 err = l2cap_tx(chan, 0, &seg_queue, 2260 err = l2cap_tx(chan, NULL, &seg_queue,
2261 L2CAP_EV_DATA_REQUEST); 2261 L2CAP_EV_DATA_REQUEST);
2262 else 2262 else
2263 err = l2cap_streaming_send(chan, &seg_queue); 2263 err = l2cap_streaming_send(chan, &seg_queue);
@@ -2571,14 +2571,14 @@ static void l2cap_pass_to_tx(struct l2cap_chan *chan,
2571 struct l2cap_ctrl *control) 2571 struct l2cap_ctrl *control)
2572{ 2572{
2573 BT_DBG("chan %p, control %p", chan, control); 2573 BT_DBG("chan %p, control %p", chan, control);
2574 l2cap_tx(chan, control, 0, L2CAP_EV_RECV_REQSEQ_AND_FBIT); 2574 l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_REQSEQ_AND_FBIT);
2575} 2575}
2576 2576
2577static void l2cap_pass_to_tx_fbit(struct l2cap_chan *chan, 2577static void l2cap_pass_to_tx_fbit(struct l2cap_chan *chan,
2578 struct l2cap_ctrl *control) 2578 struct l2cap_ctrl *control)
2579{ 2579{
2580 BT_DBG("chan %p, control %p", chan, control); 2580 BT_DBG("chan %p, control %p", chan, control);
2581 l2cap_tx(chan, control, 0, L2CAP_EV_RECV_FBIT); 2581 l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_FBIT);
2582} 2582}
2583 2583
2584/* Copy frame to all raw sockets on that connection */ 2584/* Copy frame to all raw sockets on that connection */
@@ -4553,7 +4553,7 @@ void l2cap_chan_busy(struct l2cap_chan *chan, int busy)
4553 return; 4553 return;
4554 4554
4555 event = busy ? L2CAP_EV_LOCAL_BUSY_DETECTED : L2CAP_EV_LOCAL_BUSY_CLEAR; 4555 event = busy ? L2CAP_EV_LOCAL_BUSY_DETECTED : L2CAP_EV_LOCAL_BUSY_CLEAR;
4556 l2cap_tx(chan, 0, 0, event); 4556 l2cap_tx(chan, NULL, NULL, event);
4557} 4557}
4558 4558
4559static int l2cap_rx_queued_iframes(struct l2cap_chan *chan) 4559static int l2cap_rx_queued_iframes(struct l2cap_chan *chan)