diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-03 10:40:52 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-11 10:29:09 -0400 |
commit | c470e319b48bf1aae6185f0c896e65c21c02bad3 (patch) | |
tree | 0490b31602aaa45a0609a91f8c4aaaad910a48c2 /net/nfc | |
parent | b436a13debec2b3d2c671d6bebcdb91dabcb0795 (diff) |
NFC: llcp: Remove local_cleanup last argument
local_cleanup is always called with device set to false as it means the
local LLCP is going away. So no need to pass this switch as an argument.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/llcp/llcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c index 99ec39d6e937..3a161c87ef78 100644 --- a/net/nfc/llcp/llcp.c +++ b/net/nfc/llcp/llcp.c | |||
@@ -163,9 +163,9 @@ struct nfc_llcp_local *nfc_llcp_local_get(struct nfc_llcp_local *local) | |||
163 | return local; | 163 | return local; |
164 | } | 164 | } |
165 | 165 | ||
166 | static void local_cleanup(struct nfc_llcp_local *local, bool listen) | 166 | static void local_cleanup(struct nfc_llcp_local *local) |
167 | { | 167 | { |
168 | nfc_llcp_socket_release(local, listen, ENXIO); | 168 | nfc_llcp_socket_release(local, false, ENXIO); |
169 | del_timer_sync(&local->link_timer); | 169 | del_timer_sync(&local->link_timer); |
170 | skb_queue_purge(&local->tx_queue); | 170 | skb_queue_purge(&local->tx_queue); |
171 | cancel_work_sync(&local->tx_work); | 171 | cancel_work_sync(&local->tx_work); |
@@ -184,7 +184,7 @@ static void local_release(struct kref *ref) | |||
184 | local = container_of(ref, struct nfc_llcp_local, ref); | 184 | local = container_of(ref, struct nfc_llcp_local, ref); |
185 | 185 | ||
186 | list_del(&local->list); | 186 | list_del(&local->list); |
187 | local_cleanup(local, false); | 187 | local_cleanup(local); |
188 | kfree(local); | 188 | kfree(local); |
189 | } | 189 | } |
190 | 190 | ||
@@ -1600,7 +1600,7 @@ void nfc_llcp_unregister_device(struct nfc_dev *dev) | |||
1600 | return; | 1600 | return; |
1601 | } | 1601 | } |
1602 | 1602 | ||
1603 | local_cleanup(local, false); | 1603 | local_cleanup(local); |
1604 | 1604 | ||
1605 | nfc_llcp_local_put(local); | 1605 | nfc_llcp_local_put(local); |
1606 | } | 1606 | } |