Merge "bluetooth: use corect struct member and number of protocols" (b29641e8) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/bluetooth/hci_ibs.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* protocol extension to H4.
		*
		* Copyright (C) 2007 Texas Instruments, Inc.
		* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
		* Copyright (c) 2010, 2012, 2014, The Linux Foundation. All rights reserved.
		*
		* Acknowledgements:
		* This file is based on hci_ll.c, which was...
		@@ -45,7 +45,7 @@
		#include <linux/serial_core.h>

		#ifdef CONFIG_SERIAL_MSM_HS
		#include <mach/msm_serial_hs.h>
		#include <linux/platform_data/msm_serial_hs.h>
		#endif

		#include <net/bluetooth/bluetooth.h>
		@@ -136,7 +136,7 @@ struct ibs_struct {
		static void __ibs_msm_serial_clock_on(struct tty_struct *tty)
		{
		struct uart_state *state = tty->driver_data;
		struct uart_port *port = state->port;
		struct uart_port *port = state->uart_port;

		msm_hs_request_clock_on(port);
		}
		@@ -144,7 +144,7 @@ static void __ibs_msm_serial_clock_on(struct tty_struct *tty)
		static void __ibs_msm_serial_clock_request_off(struct tty_struct *tty)
		{
		struct uart_state *state = tty->driver_data;
		struct uart_port *port = state->port;
		struct uart_port *port = state->uart_port;

		msm_hs_request_clock_off(port);
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		#define HCIUARTGETFLAGS _IOR('U', 204, int)

		/* UART protocols */
		#define HCI_UART_MAX_PROTO 6
		#define HCI_UART_MAX_PROTO 7

		#define HCI_UART_H4 0
		#define HCI_UART_BCSP 1
		@@ -51,6 +51,8 @@
		#define HCI_UART_INIT_PENDING 3
		#define HCI_UART_EXT_CONFIG 4

		#include <linux/interrupt.h>

		struct hci_uart;

		struct hci_uart_proto {
		@@ -113,6 +115,11 @@ int ath_init(void);
		int ath_deinit(void);
		#endif

		#ifdef CONFIG_BT_HCIUART_IBS
		int ibs_init(void);
		int ibs_deinit(void);
		#endif

		#ifdef CONFIG_BT_HCIUART_3WIRE
		int h5_init(void);
		int h5_deinit(void);