Commit 324d36ed authored Oct 10, 2013 by Marcel Holtmann Committed by Johan Hedberg Oct 10, 2013

Bluetooth: Remove hdev->ioctl driver callback



Since there is no use of hdev->ioctl by any Bluetooth driver since
ever, so just lets remove it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

parent e93ac9c0

include/net/bluetooth/hci_core.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -287,7 +287,6 @@ struct hci_dev {
		int (setup)(struct hci_dev hdev);
		int (send)(struct sk_buff skb);
		void (notify)(struct hci_dev hdev, unsigned int evt);
		int (ioctl)(struct hci_dev hdev, unsigned int cmd, unsigned long arg);
		};

		#define HCI_PHY_HANDLE(handle) (handle & 0xff)

net/bluetooth/hci_sock.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -553,10 +553,7 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
		return hci_sock_blacklist_del(hdev, (void __user *) arg);
		}

		if (hdev->ioctl)
		return hdev->ioctl(hdev, cmd, arg);

		return -EINVAL;
		return -ENOIOCTLCMD;
		}

		static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,