Commit 859a5935 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2018-04-01

Here's (most likely) the last bluetooth-next pull request for the 4.17
kernel:

 - Remove unused btuart_cs driver (replaced by serial_cs + hci_uart)
 - New USB ID for Edimax EW-7611ULB controller
 - Cleanups & fixes to hci_bcm driver
 - Clenups to btmrvl driver

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5366271c 9ea47132

drivers/bluetooth/Kconfig

+2 −18
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ config BT_HCIUART_ATH3K 
config BT_HCIUART_LL

	bool "HCILL protocol support"

	depends on BT_HCIUART_SERDEV

	select BT_HCIUART_H4

	help

	  HCILL (HCI Low Level) is a serial protocol for communication

	  between Bluetooth device and host. This protocol is required for
@@ -242,8 +243,7 @@ config BT_HCIBCM203X 


config BT_HCIBPA10X

	tristate "HCI BPA10x USB driver"

	depends on USB && BT_HCIUART

	select BT_HCIUART_H4

	depends on USB

	help

	  Bluetooth HCI BPA10x USB driver.

	  This driver provides support for the Digianswer BPA 100/105 Bluetooth
@@ -305,22 +305,6 @@ config BT_HCIBLUECARD 
	  Say Y here to compile support for HCI BlueCard devices into the

	  kernel or say M to compile it as module (bluecard_cs).



config BT_HCIBTUART

	tristate "HCI UART (PC Card) device driver"

	depends on PCMCIA

	help

	  Bluetooth HCI UART (PC Card) driver.

	  This driver provides support for Bluetooth PCMCIA devices with

	  an UART interface:

	     Xircom CreditCard Bluetooth Adapter

	     Xircom RealPort2 Bluetooth Adapter

	     Sphinx PICO Card

	     H-Soft blue+Card

	     Cyber-blue Compact Flash Card



	  Say Y here to compile support for HCI UART devices into the

	  kernel or say M to compile it as module (btuart_cs).



config BT_HCIVHCI

	tristate "HCI VHCI (Virtual HCI device) driver"

	help

drivers/bluetooth/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_BT_HCIBFUSB) += bfusb.o 
obj-$(CONFIG_BT_HCIDTL1)	+= dtl1_cs.o

obj-$(CONFIG_BT_HCIBT3C)	+= bt3c_cs.o

obj-$(CONFIG_BT_HCIBLUECARD)	+= bluecard_cs.o

obj-$(CONFIG_BT_HCIBTUART)	+= btuart_cs.o



obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o

obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#include "hci_uart.h"

#include "h4_recv.h"



#define VERSION "0.11"

drivers/bluetooth/btmrvl_sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 
	int ret, num_blocks, blksz;

	struct sk_buff *skb = NULL;

	u32 type;

	u8 *payload = NULL;

	u8 *payload;

	struct hci_dev *hdev = priv->btmrvl_dev.hcidev;

	struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
@@ -920,7 +920,7 @@ static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card) 
{

	struct sdio_func *func;

	u8 reg;

	int ret = 0;

	int ret;



	if (!card || !card->func) {

		BT_ERR("Error: card or function is NULL!");

drivers/bluetooth/btrsi.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/version.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <net/bluetooth/bluetooth.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE