| Message ID | 1579596583-258090-1-git-send-email-alex.shi@linux.alibaba.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/bluetooth: remove __get_channel/dir | expand |
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 <alex.shi@linux.alibaba.com> > Cc: Marcel Holtmann <marcel@holtmann.org> > Cc: Johan Hedberg <johan.hedberg@gmail.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> > Cc: linux-bluetooth@vger.kernel.org > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > 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/1/22 上午12:19, Marcel Holtmann 写道: > 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 <alex.shi@linux.alibaba.com> >> Cc: Marcel Holtmann <marcel@holtmann.org> >> Cc: Johan Hedberg <johan.hedberg@gmail.com> >> Cc: "David S. Miller" <davem@davemloft.net> >> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> >> Cc: linux-bluetooth@vger.kernel.org >> Cc: netdev@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> --- >> 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 <alex.shi@linux.alibaba.com> 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 <marcel@holtmann.org> Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> Cc: linux-bluetooth@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- 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)
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 <alex.shi@linux.alibaba.com> >>> Cc: Marcel Holtmann <marcel@holtmann.org> >>> Cc: Johan Hedberg <johan.hedberg@gmail.com> >>> Cc: "David S. Miller" <davem@davemloft.net> >>> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> >>> Cc: linux-bluetooth@vger.kernel.org >>> Cc: netdev@vger.kernel.org >>> Cc: linux-kernel@vger.kernel.org >>> --- >>> 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 <alex.shi@linux.alibaba.com> > 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 <marcel@holtmann.org> > Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> > Cc: Marcel Holtmann <marcel@holtmann.org> > Cc: Johan Hedberg <johan.hedberg@gmail.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> > Cc: linux-bluetooth@vger.kernel.org > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > 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
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))
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 <alex.shi@linux.alibaba.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> Cc: linux-bluetooth@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- net/bluetooth/rfcomm/core.c | 2 -- 1 file changed, 2 deletions(-)