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

Commit 3dc07322 authored by David Herrmann's avatar David Herrmann Committed by Johan Hedberg
Browse files

Bluetooth: Introduce to_hci_conn 



This avoids using the dev_set/get_drvdata() functions to retrieve a
pointer to our own structure. We can use simple pointer arithmetic here.
The drvdata field is actually not needed by any other code-path but this
makes the code more consistent with hci_dev.

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 155961e8

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ static inline struct hci_dev *hci_dev_hold(struct hci_dev *d) 
#define hci_dev_unlock(d)	mutex_unlock(&d->lock)



#define to_hci_dev(d) container_of(d, struct hci_dev, dev)

#define to_hci_conn(c) container_of(c, struct hci_conn, dev)



static inline void *hci_get_drvdata(struct hci_dev *hdev)

{

net/bluetooth/hci_sysfs.c

+4 −6
Original line number Diff line number Diff line
@@ -33,19 +33,19 @@ static inline char *link_typetostr(int type) 


static ssize_t show_link_type(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hci_conn *conn = dev_get_drvdata(dev);

	struct hci_conn *conn = to_hci_conn(dev);

	return sprintf(buf, "%s\n", link_typetostr(conn->type));

}



static ssize_t show_link_address(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hci_conn *conn = dev_get_drvdata(dev);

	struct hci_conn *conn = to_hci_conn(dev);

	return sprintf(buf, "%s\n", batostr(&conn->dst));

}



static ssize_t show_link_features(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hci_conn *conn = dev_get_drvdata(dev);

	struct hci_conn *conn = to_hci_conn(dev);



	return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

				conn->features[0], conn->features[1],
@@ -79,7 +79,7 @@ static const struct attribute_group *bt_link_groups[] = { 


static void bt_link_release(struct device *dev)

{

	void *data = dev_get_drvdata(dev);

	void *data = to_hci_conn(dev);

	kfree(data);

}
@@ -120,8 +120,6 @@ void hci_conn_add_sysfs(struct hci_conn *conn) 


	dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);



	dev_set_drvdata(&conn->dev, conn);



	if (device_add(&conn->dev) < 0) {

		BT_ERR("Failed to register connection device");

		return;