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

Commit 9d1c40eb authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: hci_uart: Use const data pointer for received data 



The TTY layer provides its data pointers as const, but the HCI UART
callbacks expect them as general data pointers. This is of course
wrong and instead of casting them, just fix the individual drivers
to actually take a const data pointer.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 5c7d2dd2

drivers/bluetooth/hci_ath.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu) 
}



/* Recv data */

static int ath_recv(struct hci_uart *hu, void *data, int count)

static int ath_recv(struct hci_uart *hu, const void *data, int count)

{

	int ret;

drivers/bluetooth/hci_bcsp.c

+2 −2
Original line number Diff line number Diff line
@@ -554,10 +554,10 @@ static u16 bscp_get_crc(struct bcsp_struct *bcsp) 
}



/* Recv data */

static int bcsp_recv(struct hci_uart *hu, void *data, int count)

static int bcsp_recv(struct hci_uart *hu, const void *data, int count)

{

	struct bcsp_struct *bcsp = hu->priv;

	unsigned char *ptr;

	const unsigned char *ptr;



	BT_DBG("hu %p count %d rx_state %d rx_count %ld", 

		hu, count, bcsp->rx_state, bcsp->rx_count);

drivers/bluetooth/hci_h4.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb) 
}



/* Recv data */

static int h4_recv(struct hci_uart *hu, void *data, int count)

static int h4_recv(struct hci_uart *hu, const void *data, int count)

{

	int ret;

drivers/bluetooth/hci_h5.c

+2 −2
Original line number Diff line number Diff line
@@ -511,10 +511,10 @@ static void h5_reset_rx(struct h5 *h5) 
	clear_bit(H5_RX_ESC, &h5->flags);

}



static int h5_recv(struct hci_uart *hu, void *data, int count)

static int h5_recv(struct hci_uart *hu, const void *data, int count)

{

	struct h5 *h5 = hu->priv;

	unsigned char *ptr = data;

	const unsigned char *ptr = data;



	BT_DBG("%s pending %zu count %d", hu->hdev->name, h5->rx_pending,

	       count);

drivers/bluetooth/hci_ldisc.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, 
		return;



	spin_lock(&hu->rx_lock);

	hu->proto->recv(hu, (void *) data, count);

	hu->proto->recv(hu, data, count);



	if (hu->hdev)

		hu->hdev->stat.byte_rx += count;