2020-01-21 08:50:38

by Alex Shi

Subject: [PATCH] net/bluetooth: remove __get_channel/dir

These 2 macros are never used from first git commit Linux-2.6.12-rc2. So
better to remove them.

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

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 3a9e9d9670be..825adff79f13 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))
--
1.8.3.1

2020-01-21 16:19:48

by Marcel Holtmann

Subject: Re: [PATCH] net/bluetooth: remove __get_channel/dir

Hi Alex,

> These 2 macros are never used from first git commit Linux-2.6.12-rc2. So
> better to remove them.
>
> Signed-off-by: Alex Shi <[email protected]>
> Cc: Marcel Holtmann <[email protected]>
> Cc: Johan Hedberg <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: "Gustavo A. R. Silva" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> net/bluetooth/rfcomm/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
> index 3a9e9d9670be..825adff79f13 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))

it seems we are also not using __dir macro either.

Regards

Marcel

2020-02-04 14:58:36

by Marcel Holtmann

Subject: Re: [PATCH] net/bluetooth: remove __get_channel/dir

Hi Alex,

>>> These 2 macros are never used from first git commit Linux-2.6.12-rc2. So
>>> better to remove them.
>>>
>>> Signed-off-by: Alex Shi <[email protected]>
>>> Cc: Marcel Holtmann <[email protected]>
>>> Cc: Johan Hedberg <[email protected]>
>>> Cc: "David S. Miller" <[email protected]>
>>> Cc: "Gustavo A. R. Silva" <[email protected]>
>>> Cc: [email protected]
>>> Cc: [email protected]
>>> Cc: [email protected]
>>> ---
>>> net/bluetooth/rfcomm/core.c | 2 --
>>> 1 file changed, 2 deletions(-)
>>>
>>> diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
>>> index 3a9e9d9670be..825adff79f13 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))
>>
>> it seems we are also not using __dir macro either.
>>
>
> Hi Marcel,
>
> Thanks a lot for reminder. How about the following patch?
>
> Thanks
> Alex
>
> From 41ef02c2f52cee1d69bb0ba0fbd90247d61dc155 Mon Sep 17 00:00:00 2001
> From: Alex Shi <[email protected]>
> Date: Wed, 15 Jan 2020 17:11:01 +0800
> Subject: [PATCH v2] net/bluetooth: remove __get_channel/dir and __dir
>
> These 3 macros are never used from first git commit Linux-2.6.12-rc2.
> let's remove them.
>
> Suggested-by: Marcel Holtmann <[email protected]>
> Signed-off-by: Alex Shi <[email protected]>
> Cc: Marcel Holtmann <[email protected]>
> Cc: Johan Hedberg <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: "Gustavo A. R. Silva" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> net/bluetooth/rfcomm/core.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> 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)

just send a proper patch to the mailing list so that I can apply it.

Regards

Marcel