summaryrefslogtreecommitdiff
path: root/drivers/bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/Config.help18
-rw-r--r--drivers/bluetooth/Config.in22
-rw-r--r--drivers/bluetooth/Makefile16
-rw-r--r--drivers/bluetooth/bluecard_cs.c6
-rw-r--r--drivers/bluetooth/bt3c_cs.c4
-rw-r--r--drivers/bluetooth/dtl1_cs.c6
-rw-r--r--drivers/bluetooth/hci_bcsp.c14
-rw-r--r--drivers/bluetooth/hci_h4.c8
-rw-r--r--drivers/bluetooth/hci_ldisc.c20
-rw-r--r--drivers/bluetooth/hci_usb.c18
-rw-r--r--drivers/bluetooth/hci_vhci.c10
11 files changed, 71 insertions, 71 deletions
diff --git a/drivers/bluetooth/Config.help b/drivers/bluetooth/Config.help
index 6196615c7ec2..212fec68fdb3 100644
--- a/drivers/bluetooth/Config.help
+++ b/drivers/bluetooth/Config.help
@@ -1,5 +1,5 @@
HCI UART driver
-CONFIG_BLUEZ_HCIUART
+CONFIG_BT_HCIUART
Bluetooth HCI UART driver.
This driver is required if you want to use Bluetooth devices with
serial port interface. You will also need this driver if you have
@@ -10,7 +10,7 @@ CONFIG_BLUEZ_HCIUART
kernel or say M to compile it as module (hci_uart.o).
HCI UART (H4) protocol support
-CONFIG_BLUEZ_HCIUART_H4
+CONFIG_BT_HCIUART_H4
UART (H4) is serial protocol for communication between Bluetooth
device and host. This protocol is required for most Bluetooth devices
with UART interface, including PCMCIA and CF cards.
@@ -18,7 +18,7 @@ CONFIG_BLUEZ_HCIUART_H4
Say Y here to compile support for HCI UART (H4) protocol.
HCI BCSP protocol support
-CONFIG_BLUEZ_HCIUART_BCSP
+CONFIG_BT_HCIUART_BCSP
BCSP (BlueCore Serial Protocol) is serial protocol for communication
between Bluetooth device and host. This protocol is required for non
USB Bluetooth devices based on CSR BlueCore chip, including PCMCIA and
@@ -27,7 +27,7 @@ CONFIG_BLUEZ_HCIUART_BCSP
Say Y here to compile support for HCI BCSP protocol.
HCI USB driver
-CONFIG_BLUEZ_HCIUSB
+CONFIG_BT_HCIUSB
Bluetooth HCI USB driver.
This driver is required if you want to use Bluetooth devices with
USB interface.
@@ -36,7 +36,7 @@ CONFIG_BLUEZ_HCIUSB
kernel or say M to compile it as module (hci_usb.o).
HCI USB zero packet support
-CONFIG_BLUEZ_USB_ZERO_PACKET
+CONFIG_BT_USB_ZERO_PACKET
Support for USB zero packets.
This option is provided only as a work around for buggy Bluetooth USB
devices. Do _not_ enable it unless you know for sure that your device
@@ -44,7 +44,7 @@ CONFIG_BLUEZ_USB_ZERO_PACKET
Most people should say N here.
HCI VHCI Virtual HCI device driver
-CONFIG_BLUEZ_HCIVHCI
+CONFIG_BT_HCIVHCI
Bluetooth Virtual HCI device driver.
This driver is required if you want to use HCI Emulation software.
@@ -52,7 +52,7 @@ CONFIG_BLUEZ_HCIVHCI
kernel or say M to compile it as module (hci_vhci.o).
HCI DTL1 (PC Card) device driver
-CONFIG_BLUEZ_HCIDTL1
+CONFIG_BT_HCIDTL1
Bluetooth HCI DTL1 (PC Card) driver.
This driver provides support for Bluetooth PCMCIA devices with
Nokia DTL1 interface:
@@ -63,7 +63,7 @@ CONFIG_BLUEZ_HCIDTL1
kernel or say M to compile it as module (dtl1_cs.o).
HCI BT3C (PC Card) device driver
-CONFIG_BLUEZ_HCIBT3C
+CONFIG_BT_HCIBT3C
Bluetooth HCI BT3C (PC Card) driver.
This driver provides support for Bluetooth PCMCIA devices with
3Com BT3C interface:
@@ -77,7 +77,7 @@ CONFIG_BLUEZ_HCIBT3C
kernel or say M to compile it as module (bt3c_cs.o).
HCI BlueCard (PC Card) device driver
-CONFIG_BLUEZ_HCIBLUECARD
+CONFIG_BT_HCIBLUECARD
Bluetooth HCI BlueCard (PC Card) driver.
This driver provides support for Bluetooth PCMCIA devices with
Anycom BlueCard interface:
diff --git a/drivers/bluetooth/Config.in b/drivers/bluetooth/Config.in
index a411065d23b7..46f37275ff76 100644
--- a/drivers/bluetooth/Config.in
+++ b/drivers/bluetooth/Config.in
@@ -1,23 +1,23 @@
mainmenu_option next_comment
comment 'Bluetooth device drivers'
-dep_tristate 'HCI USB driver' CONFIG_BLUEZ_HCIUSB $CONFIG_BLUEZ $CONFIG_USB
-if [ "$CONFIG_BLUEZ_HCIUSB" != "n" ]; then
- bool ' USB zero packet support' CONFIG_BLUEZ_USB_ZERO_PACKET
+dep_tristate 'HCI USB driver' CONFIG_BT_HCIUSB $CONFIG_BT $CONFIG_USB
+if [ "$CONFIG_BT_HCIUSB" != "n" ]; then
+ bool ' USB zero packet support' CONFIG_BT_USB_ZERO_PACKET
fi
-dep_tristate 'HCI UART driver' CONFIG_BLUEZ_HCIUART $CONFIG_BLUEZ
-if [ "$CONFIG_BLUEZ_HCIUART" != "n" ]; then
- bool ' UART (H4) protocol support' CONFIG_BLUEZ_HCIUART_H4
- bool ' BCSP protocol support' CONFIG_BLUEZ_HCIUART_BCSP
+dep_tristate 'HCI UART driver' CONFIG_BT_HCIUART $CONFIG_BT
+if [ "$CONFIG_BT_HCIUART" != "n" ]; then
+ bool ' UART (H4) protocol support' CONFIG_BT_HCIUART_H4
+ bool ' BCSP protocol support' CONFIG_BT_HCIUART_BCSP
fi
-dep_tristate 'HCI DTL1 (PC Card) driver' CONFIG_BLUEZ_HCIDTL1 $CONFIG_PCMCIA $CONFIG_BLUEZ
+dep_tristate 'HCI DTL1 (PC Card) driver' CONFIG_BT_HCIDTL1 $CONFIG_PCMCIA $CONFIG_BT
-dep_tristate 'HCI BT3C (PC Card) driver' CONFIG_BLUEZ_HCIBT3C $CONFIG_PCMCIA $CONFIG_BLUEZ
+dep_tristate 'HCI BT3C (PC Card) driver' CONFIG_BT_HCIBT3C $CONFIG_PCMCIA $CONFIG_BT
-dep_tristate 'HCI BlueCard (PC Card) driver' CONFIG_BLUEZ_HCIBLUECARD $CONFIG_PCMCIA $CONFIG_BLUEZ
+dep_tristate 'HCI BlueCard (PC Card) driver' CONFIG_BT_HCIBLUECARD $CONFIG_PCMCIA $CONFIG_BT
-dep_tristate 'HCI VHCI (Virtual HCI device) driver' CONFIG_BLUEZ_HCIVHCI $CONFIG_BLUEZ
+dep_tristate 'HCI VHCI (Virtual HCI device) driver' CONFIG_BT_HCIVHCI $CONFIG_BT
endmenu
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 15e76c032f2c..1fbd6f052b07 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -2,16 +2,16 @@
# Makefile for the Linux Bluetooth HCI device drivers.
#
-obj-$(CONFIG_BLUEZ_HCIUSB) += hci_usb.o
-obj-$(CONFIG_BLUEZ_HCIVHCI) += hci_vhci.o
-obj-$(CONFIG_BLUEZ_HCIUART) += hci_uart.o
-obj-$(CONFIG_BLUEZ_HCIDTL1) += dtl1_cs.o
-obj-$(CONFIG_BLUEZ_HCIBT3C) += bt3c_cs.o
-obj-$(CONFIG_BLUEZ_HCIBLUECARD) += bluecard_cs.o
+obj-$(CONFIG_BT_HCIUSB) += hci_usb.o
+obj-$(CONFIG_BT_HCIVHCI) += hci_vhci.o
+obj-$(CONFIG_BT_HCIUART) += hci_uart.o
+obj-$(CONFIG_BT_HCIDTL1) += dtl1_cs.o
+obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o
+obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o
hci_uart-y := hci_ldisc.o
-hci_uart-$(CONFIG_BLUEZ_HCIUART_H4) += hci_h4.o
-hci_uart-$(CONFIG_BLUEZ_HCIUART_BCSP) += hci_bcsp.o
+hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o
+hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o
hci_uart-objs := $(hci_uart-y)
include $(TOPDIR)/Rules.make
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 296d674bc38a..67dcad9138da 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -60,7 +60,7 @@ MODULE_PARM(irq_mask, "i");
MODULE_PARM(irq_list, "1-4i");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("BlueZ driver for the Anycom BlueCard (LSE039/LSE041)");
+MODULE_DESCRIPTION("Bluetooth driver for the Anycom BlueCard (LSE039/LSE041)");
MODULE_LICENSE("GPL");
@@ -396,7 +396,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset)
if (info->rx_skb == NULL) {
info->rx_state = RECV_WAIT_PACKET_TYPE;
info->rx_count = 0;
- if (!(info->rx_skb = bluez_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+ if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
printk(KERN_WARNING "bluecard_cs: Can't allocate mem for new packet.\n");
return;
}
@@ -571,7 +571,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
/* Ericsson baud rate command */
unsigned char cmd[] = { HCI_COMMAND_PKT, 0x09, 0xfc, 0x01, 0x03 };
- if (!(skb = bluez_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+ if (!(skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
printk(KERN_WARNING "bluecard_cs: Can't allocate mem for new packet.\n");
return -1;
}
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 517fd86199a4..460652790b07 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -72,7 +72,7 @@ MODULE_PARM(irq_mask, "i");
MODULE_PARM(irq_list, "1-4i");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>, Jose Orlando Pereira <jop@di.uminho.pt>");
-MODULE_DESCRIPTION("BlueZ driver for the 3Com Bluetooth PCMCIA card");
+MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card");
MODULE_LICENSE("GPL");
@@ -264,7 +264,7 @@ static void bt3c_receive(bt3c_info_t *info)
if (info->rx_skb == NULL) {
info->rx_state = RECV_WAIT_PACKET_TYPE;
info->rx_count = 0;
- if (!(info->rx_skb = bluez_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+ if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
printk(KERN_WARNING "bt3c_cs: Can't allocate mem for new packet.\n");
return;
}
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 80df236ec1dc..63de1e3fc4ac 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -66,7 +66,7 @@ MODULE_PARM(irq_mask, "i");
MODULE_PARM(irq_list, "1-4i");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("BlueZ driver for Nokia Connectivity Card DTL-1");
+MODULE_DESCRIPTION("Bluetooth driver for Nokia Connectivity Card DTL-1");
MODULE_LICENSE("GPL");
@@ -238,7 +238,7 @@ static void dtl1_receive(dtl1_info_t *info)
/* Allocate packet */
if (info->rx_skb == NULL)
- if (!(info->rx_skb = bluez_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+ if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
printk(KERN_WARNING "dtl1_cs: Can't allocate mem for new packet.\n");
info->rx_state = RECV_WAIT_NSH;
info->rx_count = NSHL;
@@ -433,7 +433,7 @@ static int dtl1_hci_send_frame(struct sk_buff *skb)
nsh.zero = 0;
nsh.len = skb->len;
- s = bluez_skb_alloc(NSHL + skb->len + 1, GFP_ATOMIC);
+ s = bt_skb_alloc(NSHL + skb->len + 1, GFP_ATOMIC);
skb_reserve(s, NSHL);
memcpy(skb_put(s, skb->len), skb->data, skb->len);
if (skb->len & 0x0001)
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index b3f3c71c8287..bfd5401987ec 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -57,7 +57,7 @@
#include "hci_uart.h"
#include "hci_bcsp.h"
-#ifndef HCI_UART_DEBUG
+#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#undef BT_DMP
@@ -176,7 +176,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
u8 hdr[4], chan;
int rel, i;
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP_TXCRC
+#ifdef CONFIG_BT_HCIUART_BCSP_TXCRC
u16 BCSP_CRC_INIT(bcsp_txmsg_crc);
#endif
@@ -228,7 +228,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq);
bcsp->msgq_txseq = ++(bcsp->msgq_txseq) & 0x07;
}
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP_TXCRC
+#ifdef CONFIG_BT_HCIUART_BCSP_TXCRC
hdr[0] |= 0x40;
#endif
@@ -240,7 +240,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
/* Put BCSP header */
for (i = 0; i < 4; i++) {
bcsp_slip_one_byte(nskb, hdr[i]);
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP_TXCRC
+#ifdef CONFIG_BT_HCIUART_BCSP_TXCRC
bcsp_crc_update(&bcsp_txmsg_crc, hdr[i]);
#endif
}
@@ -248,12 +248,12 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
/* Put payload */
for (i = 0; i < len; i++) {
bcsp_slip_one_byte(nskb, data[i]);
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP_TXCRC
+#ifdef CONFIG_BT_HCIUART_BCSP_TXCRC
bcsp_crc_update(&bcsp_txmsg_crc, data[i]);
#endif
}
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP_TXCRC
+#ifdef CONFIG_BT_HCIUART_BCSP_TXCRC
/* Put CRC */
bcsp_txmsg_crc = bcsp_crc_reverse(bcsp_txmsg_crc);
bcsp_slip_one_byte(nskb, (u8) ((bcsp_txmsg_crc >> 8) & 0x00ff));
@@ -611,7 +611,7 @@ static int bcsp_recv(struct hci_uart *hu, void *data, int count)
* Allocate packet. Max len of a BCSP pkt=
* 0xFFF (payload) +4 (header) +2 (crc) */
- bcsp->rx_skb = bluez_skb_alloc(0x1005, GFP_ATOMIC);
+ bcsp->rx_skb = bt_skb_alloc(0x1005, GFP_ATOMIC);
if (!bcsp->rx_skb) {
BT_ERR("Can't allocate mem for new packet");
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 0e2a25e0526e..521eb19442be 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -23,7 +23,7 @@
*/
/*
- * BlueZ HCI UART(H4) protocol.
+ * Bluetooth HCI UART(H4) protocol.
*
* $Id: hci_h4.c,v 1.3 2002/09/09 01:17:32 maxk Exp $
*/
@@ -56,7 +56,7 @@
#include "hci_uart.h"
#include "hci_h4.h"
-#ifndef HCI_UART_DEBUG
+#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#undef BT_DMP
@@ -160,7 +160,7 @@ static int h4_recv(struct hci_uart *hu, void *data, int count)
ptr = data;
while (count) {
if (h4->rx_count) {
- len = MIN(h4->rx_count, count);
+ len = min_t(unsigned int, h4->rx_count, count);
memcpy(skb_put(h4->rx_skb, len), ptr, len);
h4->rx_count -= len; count -= len; ptr += len;
@@ -238,7 +238,7 @@ static int h4_recv(struct hci_uart *hu, void *data, int count)
ptr++; count--;
/* Allocate packet */
- h4->rx_skb = bluez_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
+ h4->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
if (!h4->rx_skb) {
BT_ERR("Can't allocate mem for new packet");
h4->rx_state = H4_W4_PACKET_TYPE;
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 067a25c7fc1f..e5196a92b7ba 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -23,7 +23,7 @@
*/
/*
- * BlueZ HCI UART driver.
+ * Bluetooth HCI UART driver.
*
* $Id: hci_ldisc.c,v 1.5 2002/10/02 18:37:20 maxk Exp $
*/
@@ -55,7 +55,7 @@
#include <net/bluetooth/hci_core.h>
#include "hci_uart.h"
-#ifndef HCI_UART_DEBUG
+#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#undef BT_DMP
@@ -507,11 +507,11 @@ static unsigned int hci_uart_tty_poll(struct tty_struct *tty, struct file *filp,
return 0;
}
-#ifdef CONFIG_BLUEZ_HCIUART_H4
+#ifdef CONFIG_BT_HCIUART_H4
int h4_init(void);
int h4_deinit(void);
#endif
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP
+#ifdef CONFIG_BT_HCIUART_BCSP
int bcsp_init(void);
int bcsp_deinit(void);
#endif
@@ -521,7 +521,7 @@ int __init hci_uart_init(void)
static struct tty_ldisc hci_uart_ldisc;
int err;
- BT_INFO("BlueZ HCI UART driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
+ BT_INFO("Bluetooth HCI UART driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
VERSION);
BT_INFO("Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>");
@@ -545,10 +545,10 @@ int __init hci_uart_init(void)
return err;
}
-#ifdef CONFIG_BLUEZ_HCIUART_H4
+#ifdef CONFIG_BT_HCIUART_H4
h4_init();
#endif
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP
+#ifdef CONFIG_BT_HCIUART_BCSP
bcsp_init();
#endif
@@ -559,10 +559,10 @@ void hci_uart_cleanup(void)
{
int err;
-#ifdef CONFIG_BLUEZ_HCIUART_H4
+#ifdef CONFIG_BT_HCIUART_H4
h4_deinit();
#endif
-#ifdef CONFIG_BLUEZ_HCIUART_BCSP
+#ifdef CONFIG_BT_HCIUART_BCSP
bcsp_deinit();
#endif
@@ -575,5 +575,5 @@ module_init(hci_uart_init);
module_exit(hci_uart_cleanup);
MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");
-MODULE_DESCRIPTION("BlueZ HCI UART driver ver " VERSION);
+MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION);
MODULE_LICENSE("GPL");
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index a94786f7d6ba..027b4463f3c9 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -23,7 +23,7 @@
*/
/*
- * BlueZ HCI USB driver.
+ * Bluetooth HCI USB driver.
* Based on original USB Bluetooth driver for Linux kernel
* Copyright (c) 2000 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (c) 2000 Mark Douglas Corner <mcorner@umich.edu>
@@ -59,14 +59,14 @@
#define HCI_MAX_PENDING (HCI_MAX_BULK_RX + HCI_MAX_BULK_TX + 1)
-#ifndef HCI_USB_DEBUG
+#ifndef CONFIG_BT_HCIUSB_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#undef BT_DMP
#define BT_DMP( A... )
#endif
-#ifndef CONFIG_BLUEZ_USB_ZERO_PACKET
+#ifndef CONFIG_BT_USB_ZERO_PACKET
#undef USB_ZERO_PACKET
#define USB_ZERO_PACKET 0
#endif
@@ -167,7 +167,7 @@ static int hci_usb_rx_submit(struct hci_usb *husb, struct urb *urb)
size = HCI_MAX_FRAME_SIZE;
- if (!(skb = bluez_skb_alloc(size, GFP_ATOMIC))) {
+ if (!(skb = bt_skb_alloc(size, GFP_ATOMIC))) {
usb_free_urb(urb);
return -ENOMEM;
}
@@ -465,7 +465,7 @@ static void hci_usb_interrupt(struct urb *urb)
if (count > len)
goto bad_len;
- skb = bluez_skb_alloc(len, GFP_ATOMIC);
+ skb = bt_skb_alloc(len, GFP_ATOMIC);
if (!skb) {
BT_ERR("%s no memory for event packet", husb->hdev.name);
goto done;
@@ -569,7 +569,7 @@ static void hci_usb_rx_complete(struct urb *urb)
if (count != size) {
BT_ERR("%s corrupted ACL packet: count %d, dlen %d",
husb->hdev.name, count, dlen);
- bluez_dump("hci_usb", skb->data, count);
+ bt_dump("hci_usb", skb->data, count);
husb->hdev.stat.err_rx++;
goto resubmit;
}
@@ -639,7 +639,7 @@ int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
/* Find endpoints that we need */
- ifn = MIN(udev->actconfig->bNumInterfaces, HCI_MAX_IFACE_NUM);
+ ifn = min_t(unsigned int, udev->actconfig->bNumInterfaces, HCI_MAX_IFACE_NUM);
for (i = 0; i < ifn; i++) {
iface = &udev->actconfig->interface[i];
for (a = 0; a < iface->num_altsetting; a++) {
@@ -781,7 +781,7 @@ int hci_usb_init(void)
{
int err;
- BT_INFO("BlueZ HCI USB driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
+ BT_INFO("Bluetooth HCI USB driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
VERSION);
BT_INFO("Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>");
@@ -800,5 +800,5 @@ module_init(hci_usb_init);
module_exit(hci_usb_cleanup);
MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");
-MODULE_DESCRIPTION("BlueZ HCI USB driver ver " VERSION);
+MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION);
MODULE_LICENSE("GPL");
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index a3ca871e2049..a70eef0fd4d9 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -23,7 +23,7 @@
*/
/*
- * BlueZ HCI virtual device driver.
+ * Bluetooth HCI virtual device driver.
*
* $Id: hci_vhci.c,v 1.3 2002/04/17 17:37:20 maxk Exp $
*/
@@ -136,7 +136,7 @@ static inline ssize_t hci_vhci_get_user(struct hci_vhci_struct *hci_vhci, const
if (count > HCI_MAX_FRAME_SIZE)
return -EINVAL;
- if (!(skb = bluez_skb_alloc(count, GFP_KERNEL)))
+ if (!(skb = bt_skb_alloc(count, GFP_KERNEL)))
return -ENOMEM;
if (copy_from_user(skb_put(skb, count), buf, count)) {
@@ -172,7 +172,7 @@ static inline ssize_t hci_vhci_put_user(struct hci_vhci_struct *hci_vhci,
int len = count, total = 0;
char *ptr = buf;
- len = MIN(skb->len, len);
+ len = min_t(unsigned int, skb->len, len);
if (copy_to_user(ptr, skb->data, len))
return -EFAULT;
total += len;
@@ -331,7 +331,7 @@ static struct miscdevice hci_vhci_miscdev=
int __init hci_vhci_init(void)
{
- BT_INFO("BlueZ VHCI driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
+ BT_INFO("Bluetooth VHCI driver ver %s Copyright (C) 2000,2001 Qualcomm Inc",
VERSION);
BT_INFO("Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>");
@@ -352,5 +352,5 @@ module_init(hci_vhci_init);
module_exit(hci_vhci_cleanup);
MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");
-MODULE_DESCRIPTION("BlueZ VHCI driver ver " VERSION);
+MODULE_DESCRIPTION("Bluetooth VHCI driver ver " VERSION);
MODULE_LICENSE("GPL");
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-27 06:25:37 +0000