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

Commit 6935e0f5 authored by David Herrmann's avatar David Herrmann Committed by Gustavo Padovan
Browse files

Bluetooth: Remove redundant hdev->parent field 



We initialize the "struct device" in hci_alloc_dev() for a long time now
so we can access hdev->dev.parent directly. Hence, we can drop the
temporary field hdev->parent which is used in no other place than
hci_add_sysfs().

SET_HCIDEV_DEV() is never called after registering a device by the
drivers so we do not overwrite internal device-state. Furthermore,
hdev->dev is initialized to 0 by kzalloc() inside hci_alloc_dev() so the
default behavior with dev.parent = NULL is kept.

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 bc3dd33c

drivers/bluetooth/hci_ldisc.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int hci_uart_register_dev(struct hci_uart *hu) 
	hdev->close = hci_uart_close;

	hdev->flush = hci_uart_flush;

	hdev->send  = hci_uart_send_frame;

	hdev->parent = hu->tty->dev;

	SET_HCIDEV_DEV(hdev, hu->tty->dev);



	if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))

		set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);

include/net/bluetooth/hci_core.h

+1 −2
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ struct hci_dev { 


	struct dentry		*debugfs;



	struct device		*parent;

	struct device		dev;



	struct rfkill		*rfkill;
@@ -709,7 +708,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn); 
void hci_conn_add_sysfs(struct hci_conn *conn);

void hci_conn_del_sysfs(struct hci_conn *conn);



#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->parent = (pdev))

#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->dev.parent = (pdev))



/* ----- LMP capabilities ----- */

#define lmp_rswitch_capable(dev)   ((dev)->features[0] & LMP_RSWITCH)

net/bluetooth/hci_sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ int hci_add_sysfs(struct hci_dev *hdev) 


	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);



	dev->parent = hdev->parent;

	dev_set_name(dev, "%s", hdev->name);



	err = device_add(dev);