Commit e228b633 authored by Gianluca Anzolin's avatar Gianluca Anzolin Committed by Marcel Holtmann
Browse files

Bluetooth: Move rfcomm_get_device() before rfcomm_dev_activate() 



This is a preparatory patch which moves the rfcomm_get_device()
definition before rfcomm_dev_activate() where it will be used.

Signed-off-by: default avatarGianluca Anzolin <gianluca@sottospazio.it>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5b899241

net/bluetooth/rfcomm/tty.c

+16 −16
Original line number Diff line number Diff line
@@ -103,6 +103,22 @@ static void rfcomm_dev_destruct(struct tty_port *port) 
	module_put(THIS_MODULE);

}



static struct device *rfcomm_get_device(struct rfcomm_dev *dev)

{

	struct hci_dev *hdev;

	struct hci_conn *conn;



	hdev = hci_get_route(&dev->dst, &dev->src);

	if (!hdev)

		return NULL;



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);



	hci_dev_put(hdev);



	return conn ? &conn->dev : NULL;

}



/* device-specific initialization: open the dlc */

static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty)

{
@@ -169,22 +185,6 @@ static struct rfcomm_dev *rfcomm_dev_get(int id) 
	return dev;

}



static struct device *rfcomm_get_device(struct rfcomm_dev *dev)

{

	struct hci_dev *hdev;

	struct hci_conn *conn;



	hdev = hci_get_route(&dev->dst, &dev->src);

	if (!hdev)

		return NULL;



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);



	hci_dev_put(hdev);



	return conn ? &conn->dev : NULL;

}



static ssize_t show_address(struct device *tty_dev, struct device_attribute *attr, char *buf)

{

	struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);