Skip to content

Commit

Permalink
Bluetooth: Remove unused and unneeded support in virtual driver
Browse files Browse the repository at this point in the history
The virtual driver implements fasync and ioctl support, but it is not used
and unneeded due to its constraints via the Bluetooth core layer. So too
just make the driver simpler, remove support for both of them.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Marcel Holtmann committed Jun 8, 2009
1 parent 3857abc commit 092b858
Showing 1 changed file with 0 additions and 31 deletions.
31 changes: 0 additions & 31 deletions drivers/bluetooth/hci_vhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,8 @@ struct vhci_data {

wait_queue_head_t read_wait;
struct sk_buff_head readq;

struct fasync_struct *fasync;
};

#define VHCI_FASYNC 0x0010

static struct miscdevice vhci_miscdev;

static int vhci_open_dev(struct hci_dev *hdev)
{
set_bit(HCI_RUNNING, &hdev->flags);
Expand Down Expand Up @@ -105,9 +99,6 @@ static int vhci_send_frame(struct sk_buff *skb)
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
skb_queue_tail(&data->readq, skb);

if (data->flags & VHCI_FASYNC)
kill_fasync(&data->fasync, SIGIO, POLL_IN);

wake_up_interruptible(&data->read_wait);

return 0;
Expand Down Expand Up @@ -293,35 +284,13 @@ static int vhci_release(struct inode *inode, struct file *file)
return 0;
}

static int vhci_fasync(int fd, struct file *file, int on)
{
struct vhci_data *data = file->private_data;
int err = 0;

lock_kernel();
err = fasync_helper(fd, file, on, &data->fasync);
if (err < 0)
goto out;

if (on)
data->flags |= VHCI_FASYNC;
else
data->flags &= ~VHCI_FASYNC;

out:
unlock_kernel();
return err;
}

static const struct file_operations vhci_fops = {
.owner = THIS_MODULE,
.read = vhci_read,
.write = vhci_write,
.poll = vhci_poll,
.ioctl = vhci_ioctl,
.open = vhci_open,
.release = vhci_release,
.fasync = vhci_fasync,
};

static struct miscdevice vhci_miscdev= {
Expand Down

0 comments on commit 092b858

Please sign in to comment.