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

Commit 01009eec authored Apr 04, 2015 by Marcel Holtmann

Bluetooth: hci_uart: Remove the manual protocol init message



The init function for each HCI UART protocol prints the same on success
and failure. This information is so generic, remove it and let the main
HCI UART handling print it instead.

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

parent 7c40fb8d

drivers/bluetooth/hci_ath.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -218,14 +218,7 @@ static const struct hci_uart_proto athp = {

	int __init ath_init(void)		int __init ath_init(void)
	{		{
	int err = hci_uart_register_proto(&athp);		return hci_uart_register_proto(&athp);

	if (!err)
	BT_INFO("HCIATH3K protocol initialized");
	else
	BT_ERR("HCIATH3K protocol registration failed");

	return err;
	}		}

	int __exit ath_deinit(void)		int __exit ath_deinit(void)

drivers/bluetooth/hci_bcsp.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -748,14 +748,7 @@ static const struct hci_uart_proto bcsp = {

	int __init bcsp_init(void)		int __init bcsp_init(void)
	{		{
	int err = hci_uart_register_proto(&bcsp);		return hci_uart_register_proto(&bcsp);

	if (!err)
	BT_INFO("HCI BCSP protocol initialized");
	else
	BT_ERR("HCI BCSP protocol registration failed");

	return err;
	}		}

	int __exit bcsp_deinit(void)		int __exit bcsp_deinit(void)

drivers/bluetooth/hci_h4.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -152,14 +152,7 @@ static const struct hci_uart_proto h4p = {

	int __init h4_init(void)		int __init h4_init(void)
	{		{
	int err = hci_uart_register_proto(&h4p);		return hci_uart_register_proto(&h4p);

	if (!err)
	BT_INFO("HCI H4 protocol initialized");
	else
	BT_ERR("HCI H4 protocol registration failed");

	return err;
	}		}

	int __exit h4_deinit(void)		int __exit h4_deinit(void)

drivers/bluetooth/hci_h5.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -756,14 +756,7 @@ static const struct hci_uart_proto h5p = {

	int __init h5_init(void)		int __init h5_init(void)
	{		{
	int err = hci_uart_register_proto(&h5p);		return hci_uart_register_proto(&h5p);

	if (!err)
	BT_INFO("HCI Three-wire UART (H5) protocol initialized");
	else
	BT_ERR("HCI Three-wire UART (H5) protocol init failed");

	return err;
	}		}

	int __exit h5_deinit(void)		int __exit h5_deinit(void)

drivers/bluetooth/hci_ldisc.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,8 @@ int hci_uart_register_proto(const struct hci_uart_proto *p)

	hup[p->id] = p;		hup[p->id] = p;

			BT_INFO("HCI UART protocol %s registered", p->name);

	return 0;		return 0;
	}		}