Skip to contentSkip to conversation

Bluetooth: Remove hdev->ioctl driver callback

PATCH In review Marcel Holtmann 1 participant 1 message Oct 10, 2013

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 7/7 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.

---
 include/net/bluetooth/hci_core.h | 1 -
 net/bluetooth/hci_sock.c         | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)
include/net/bluetooth/hci_core.h +0 -1
index c065527..237bf8c 100644
@@ -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
index 5b2d3f3..3beaa05 100644
@@ -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,
Signature · 1 line
1.8.3.1