[v2] net/bluetooth: remove __get_channel/dir and __dir

Commit Message

Alex Shi Feb. 5, 2020, 3:23 a.m. UTC

These 3 macros are never used from first git commit Linux-2.6.12-rc2.
let's remove them.

Signed-off-by: Alex Shi <[e-mail]>
Cc: Marcel Holtmann <[e-mail]>
Cc: Johan Hedberg <[e-mail]>
Cc: "David S. Miller" <[e-mail]>
Cc: "Gustavo A. R. Silva" <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
---
 net/bluetooth/rfcomm/core.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Marcel Holtmann Feb. 5, 2020, 8:08 a.m. UTC | #1

Hi Alex,

> These 3 macros are never used from first git commit Linux-2.6.12-rc2.
> let's remove them.
> 
> Signed-off-by: Alex Shi <[e-mail]>
> Cc: Marcel Holtmann <[e-mail]>
> Cc: Johan Hedberg <[e-mail]>
> Cc: "David S. Miller" <[e-mail]>
> Cc: "Gustavo A. R. Silva" <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: [e-mail]
> ---
> net/bluetooth/rfcomm/core.c | 3 ---
> 1 file changed, 3 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

Patch

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 3a9e9d9670be..dcecce087b24 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -73,8 +73,6 @@  static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
 
 /* ---- RFCOMM frame parsing macros ---- */
 #define __get_dlci(b)     ((b & 0xfc) >> 2)
-#define __get_channel(b)  ((b & 0xf8) >> 3)
-#define __get_dir(b)      ((b & 0x04) >> 2)
 #define __get_type(b)     ((b & 0xef))
 
 #define __test_ea(b)      ((b & 0x01))
@@ -87,7 +85,6 @@  static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
 #define __ctrl(type, pf)       (((type & 0xef) | (pf << 4)))
 #define __dlci(dir, chn)       (((chn & 0x1f) << 1) | dir)
 #define __srv_channel(dlci)    (dlci >> 1)
-#define __dir(dlci)            (dlci & 0x01)
 
 #define __len8(len)       (((len) << 1) | 1)
 #define __len16(len)      ((len) << 1)