dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Bluetooth: Convert controller hdev->type to hdev->bus 

The hdev->type is misnamed and should be actually hdev->bus instead. So
convert it now.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Marcel Holtmann 2010-02-08 15:27:07 +01:00
parent 10f7891f99
commit c13854cef4
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bluetooth/bfusb.c
View File

@ -703,7 +703,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
data->hdev = hdev;
hdev->type = HCI_USB;
hdev->bus = HCI_USB;
hdev->driver_data = data;
SET_HCIDEV_DEV(hdev, &intf->dev);

2
drivers/bluetooth/bluecard_cs.c
View File

@ -736,7 +736,7 @@ static int bluecard_open(bluecard_info_t *info)
info->hdev = hdev;
hdev->type = HCI_PCCARD;
hdev->bus = HCI_PCCARD;
hdev->driver_data = info;
SET_HCIDEV_DEV(hdev, &info->p_dev->dev);

2
drivers/bluetooth/bpa10x.c
View File

@ -469,7 +469,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
return -ENOMEM;
}
hdev->type = HCI_USB;
hdev->bus = HCI_USB;
hdev->driver_data = data;
data->hdev = hdev;

2
drivers/bluetooth/bt3c_cs.c
View File

@ -582,7 +582,7 @@ static int bt3c_open(bt3c_info_t *info)
info->hdev = hdev;
hdev->type = HCI_PCCARD;
hdev->bus = HCI_PCCARD;
hdev->driver_data = info;
SET_HCIDEV_DEV(hdev, &info->p_dev->dev);

2
drivers/bluetooth/btmrvl_main.c
View File

@ -563,7 +563,7 @@ struct btmrvl_private *btmrvl_add_card(void *card)
priv->btmrvl_dev.tx_dnld_rdy = true;
hdev->type = HCI_SDIO;
hdev->bus = HCI_SDIO;
hdev->open = btmrvl_open;
hdev->close = btmrvl_close;
hdev->flush = btmrvl_flush;

2
drivers/bluetooth/btsdio.c
View File

@ -326,7 +326,7 @@ static int btsdio_probe(struct sdio_func *func,
return -ENOMEM;
}
hdev->type = HCI_SDIO;
hdev->bus = HCI_SDIO;
hdev->driver_data = data;
data->hdev = hdev;

2
drivers/bluetooth/btuart_cs.c
View File

@ -500,7 +500,7 @@ static int btuart_open(btuart_info_t *info)
info->hdev = hdev;
hdev->type = HCI_PCCARD;
hdev->bus = HCI_PCCARD;
hdev->driver_data = info;
SET_HCIDEV_DEV(hdev, &info->p_dev->dev);

2
drivers/bluetooth/btusb.c
View File

@ -939,7 +939,7 @@ static int btusb_probe(struct usb_interface *intf,
return -ENOMEM;
}
hdev->type = HCI_USB;
hdev->bus = HCI_USB;
hdev->driver_data = data;
data->hdev = hdev;

2
drivers/bluetooth/dtl1_cs.c
View File

@ -485,7 +485,7 @@ static int dtl1_open(dtl1_info_t *info)
info->hdev = hdev;
hdev->type = HCI_PCCARD;
hdev->bus = HCI_PCCARD;
hdev->driver_data = info;
SET_HCIDEV_DEV(hdev, &info->p_dev->dev);

2
drivers/bluetooth/hci_ldisc.c
View File

@ -383,7 +383,7 @@ static int hci_uart_register_dev(struct hci_uart *hu)
hu->hdev = hdev;
hdev->type = HCI_UART;
hdev->bus = HCI_UART;
hdev->driver_data = hu;
hdev->open = hci_uart_open;

2
drivers/bluetooth/hci_vhci.c
View File

@ -236,7 +236,7 @@ static int vhci_open(struct inode *inode, struct file *file)
data->hdev = hdev;
hdev->type = HCI_VIRTUAL;
hdev->bus = HCI_VIRTUAL;
hdev->driver_data = data;
hdev->open = vhci_open_dev;

2
include/net/bluetooth/hci.h
View File

@ -43,7 +43,7 @@
#define HCI_NOTIFY_CONN_DEL 2
#define HCI_NOTIFY_VOICE_SETTING 3
/* HCI device types */
/* HCI bus types */
#define HCI_VIRTUAL 0
#define HCI_USB 1
#define HCI_PCCARD 2

2
include/net/bluetooth/hci_core.h
View File

@ -70,7 +70,7 @@ struct hci_dev {
char name[8];
unsigned long flags;
__u16 id;
__u8 type;
__u8 bus;
bdaddr_t bdaddr;
__u8 dev_name[248];
__u8 dev_class[3];

8
net/bluetooth/hci_core.c
View File

@ -797,7 +797,7 @@ int hci_get_dev_info(void __user *arg)
strcpy(di.name, hdev->name);
di.bdaddr = hdev->bdaddr;
di.type = hdev->type;
di.type = hdev->bus;
di.flags = hdev->flags;
di.pkt_type = hdev->pkt_type;
di.acl_mtu = hdev->acl_mtu;
@ -869,8 +869,8 @@ int hci_register_dev(struct hci_dev *hdev)
struct list_head *head = &hci_dev_list, *p;
int i, id = 0;
BT_DBG("%p name %s type %d owner %p", hdev, hdev->name,
hdev->type, hdev->owner);
BT_DBG("%p name %s bus %d owner %p", hdev, hdev->name,
hdev->bus, hdev->owner);
if (!hdev->open || !hdev->close || !hdev->destruct)
return -EINVAL;
@ -946,7 +946,7 @@ int hci_unregister_dev(struct hci_dev *hdev)
{
int i;
BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
write_lock_bh(&hci_dev_list_lock);
list_del(&hdev->list);

16
net/bluetooth/hci_sysfs.c
View File

@ -166,9 +166,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn)
queue_work(bt_workq, &conn->work_del);
}
static inline char *host_typetostr(int type)
static inline char *host_bustostr(int bus)
{
switch (type) {
switch (bus) {
case HCI_VIRTUAL:
return "VIRTUAL";
case HCI_USB:
@ -188,10 +188,10 @@ static inline char *host_typetostr(int type)
}
}
static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf)
static ssize_t show_bus(struct device *dev, struct device_attribute *attr, char *buf)
{
struct hci_dev *hdev = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", host_typetostr(hdev->type));
return sprintf(buf, "%s\n", host_bustostr(hdev->bus));
}
static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)
@ -355,7 +355,7 @@ static ssize_t store_sniff_min_interval(struct device *dev, struct device_attrib
return count;
}
static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
static DEVICE_ATTR(bus, S_IRUGO, show_bus, NULL);
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
static DEVICE_ATTR(class, S_IRUGO, show_class, NULL);
static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
@ -373,7 +373,7 @@ static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR,
show_sniff_min_interval, store_sniff_min_interval);
static struct attribute *bt_host_attrs[] = {
&dev_attr_type.attr,
&dev_attr_bus.attr,
&dev_attr_name.attr,
&dev_attr_class.attr,
&dev_attr_address.attr,
@ -414,7 +414,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
struct device *dev = &hdev->dev;
int err;
BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
dev->type = &bt_host;
dev->class = bt_class;
@ -433,7 +433,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
void hci_unregister_sysfs(struct hci_dev *hdev)
{
BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
device_del(&hdev->dev);
}