[PATCH] net: bluetooth: Fix 'enable_hs' type

[PATCH] net: bluetooth: Fix 'enable_hs' type

[Fabio Estevam]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

Fix the following build warning:

  CC [M]  net/bluetooth/hci_core.o
net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
net/bluetooth/hci_core.c:2587: warning: return from incompatible pointer type

module_param in hci_core.c passes 'enable_hs' as bool format, so fix this variable definition type.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 include/net/bluetooth/hci.h |    2 +-
 net/bluetooth/hci_core.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 5b2fed5..00596e8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1388,6 +1388,6 @@ struct hci_inquiry_req {
 };
 #define IREQ_CACHE_FLUSH 0x0001
 
-extern int enable_hs;
+extern bool enable_hs;
 
 #endif /* __HCI_H */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 845da3e..9de9371 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -55,7 +55,7 @@
 
 #define AUTO_OFF_TIMEOUT 2000
 
-int enable_hs;
+bool enable_hs;
 
 static void hci_rx_work(struct work_struct *work);
 static void hci_cmd_work(struct work_struct *work);
-- 
1.7.1

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Marcel Holtmann]

Hi Fabio,

> Fix the following build warning:
> 
>   CC [M]  net/bluetooth/hci_core.o
> net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
> net/bluetooth/hci_core.c:2587: warning: return from incompatible pointer type
> 
> module_param in hci_core.c passes 'enable_hs' as bool format, so fix this variable definition type.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  include/net/bluetooth/hci.h |    2 +-
>  net/bluetooth/hci_core.c    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Acked-by: Marcel Holtmann <marcel@holtmann.org>

Regards

Marcel

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Johan Hedberg]

Hi Fabio,

On Tue, Jan 10, 2012, Fabio Estevam wrote:
> Fix the following build warning:
> 
>   CC [M]  net/bluetooth/hci_core.o
> net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
> net/bluetooth/hci_core.c:2587: warning: return from incompatible pointer type
> 
> module_param in hci_core.c passes 'enable_hs' as bool format, so fix this variable definition type.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  include/net/bluetooth/hci.h |    2 +-
>  net/bluetooth/hci_core.c    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

The patch has been applied to my bluetooth-next tree. Don't you get the
same warning for enable_mgmt and enable_le as well? Those seem to be
declared in a similar manner.

Johan

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Fabio Estevam]

On Tue, Jan 10, 2012 at 7:00 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:

> The patch has been applied to my bluetooth-next tree. Don't you get the
> same warning for enable_mgmt and enable_le as well? Those seem to be
> declared in a similar manner.

No, because enable_mgmt and enable_le are already declared as 'bool'.

Regards,

Fabio Estevam

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Johan Hedberg]

Hi Fabio,

On Tue, Jan 10, 2012, Fabio Estevam wrote:
> > The patch has been applied to my bluetooth-next tree. Don't you get the
> > same warning for enable_mgmt and enable_le as well? Those seem to be
> > declared in a similar manner.
> 
> No, because enable_mgmt and enable_le are already declared as 'bool'.

I don't know what tree you're looking at but at least in mine they're
both "static int".

Johan

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Fabio Estevam]

Hi Johan,

On Tue, Jan 10, 2012 at 7:31 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> Hi Fabio,
>
> On Tue, Jan 10, 2012, Fabio Estevam wrote:
>> > The patch has been applied to my bluetooth-next tree. Don't you get the
>> > same warning for enable_mgmt and enable_le as well? Those seem to be
>> > declared in a similar manner.
>>
>> No, because enable_mgmt and enable_le are already declared as 'bool'.
>
> I don't know what tree you're looking at but at least in mine they're
> both "static int".

I am using linux-next. Please check:

http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next-history.git&a=search&h=refs%2Fheads%2Fmaster&st=grep&s=enable_mgmt

Regards,

Fabio Estevam

Re: [PATCH] net: bluetooth: Fix 'enable_hs' type

[Johan Hedberg]

Hi Fabio,

On Tue, Jan 10, 2012, Fabio Estevam wrote:
> Hi Johan,
> 
> On Tue, Jan 10, 2012 at 7:31 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> > Hi Fabio,
> >
> > On Tue, Jan 10, 2012, Fabio Estevam wrote:
> >> > The patch has been applied to my bluetooth-next tree. Don't you get the
> >> > same warning for enable_mgmt and enable_le as well? Those seem to be
> >> > declared in a similar manner.
> >>
> >> No, because enable_mgmt and enable_le are already declared as 'bool'.
> >
> > I don't know what tree you're looking at but at least in mine they're
> > both "static int".
> 
> I am using linux-next. Please check:
> 
> http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next-history.git&a=search&h=refs%2Fheads%2Fmaster&st=grep&s=enable_mgmt

Yep, seems commit eb939922 from Rusty Russel took care of this, but the
commit has not yet made it to the bluetooth-next tree.

Johan