Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 587ae086 authored by David Herrmann's avatar David Herrmann Committed by Johan Hedberg
Browse files

Bluetooth: Remove unused hci-destruct cb 



The hci-destruct callback is not used by any driver so we can remove it.
There is no reason to keep it alive, anymore. Drivers can free their
internal data on driver-release and we do not need to provide a public
destruct callback.

Internally, we still use a destruct callback inside of hci_sysfs.c. This
one is used to correctly free our hci_dev data structure if no more
users have a reference to it.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 797fe796

include/net/bluetooth/hci_core.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ struct hci_dev { 
	int (*close)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);

	int (*send)(struct sk_buff *skb);

	int (*send)(struct sk_buff *skb);

	void (*destruct)(struct hci_dev *hdev);

	void (*notify)(struct hci_dev *hdev, unsigned int evt);

	void (*notify)(struct hci_dev *hdev, unsigned int evt);

	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);

	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);

};

};
@@ -595,10 +594,7 @@ static inline void hci_conn_put(struct hci_conn *conn) 
/* ----- HCI Devices ----- */

/* ----- HCI Devices ----- */

static inline void __hci_dev_put(struct hci_dev *d)

static inline void __hci_dev_put(struct hci_dev *d)

{

{

	if (atomic_dec_and_test(&d->refcnt)) {

	atomic_dec(&d->refcnt);

		if (d->destruct)

			d->destruct(d);

	}

}

}





/*

/*