From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 6 Apr 2015 05:52:17 +0000 (-0700)
Subject: Bluetooth: hci_uart: Move setup callback into different location
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ae4fddf78c11dedfb13a518a9050e9b265529ca;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Bluetooth: hci_uart: Move setup callback into different location

The setup callback got wrongly inserted between the enqueue and dequeue
callbacks. Move it to a better location.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index ad03f57e794b..466798acf049 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -61,9 +61,9 @@ struct hci_uart_proto {
 	int (*open)(struct hci_uart *hu);
 	int (*close)(struct hci_uart *hu);
 	int (*flush)(struct hci_uart *hu);
+	int (*setup)(struct hci_uart *hu);
 	int (*recv)(struct hci_uart *hu, const void *data, int len);
 	int (*enqueue)(struct hci_uart *hu, struct sk_buff *skb);
-	int (*setup)(struct hci_uart *hu);
 	struct sk_buff *(*dequeue)(struct hci_uart *hu);
 };