Commit 11771e0b authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

net: nfc: nci: drop nci_uart_default_recv 



nci_uart_register returns -EINVAL immediately when nu->ops.recv is not
set. So the same 'if' later never triggers so nci_uart_default_recv is
never used. Drop it.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210302062214.29627-17-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2a5a45c

net/nfc/nci/uart.c

+0 −10
Original line number Diff line number Diff line
@@ -387,12 +387,6 @@ static int nci_uart_send(struct nci_uart *nu, struct sk_buff *skb) 
	return 0;

}



/* -- Default recv handler -- */

static int nci_uart_default_recv(struct nci_uart *nu, struct sk_buff *skb)

{

	return nci_recv_frame(nu->ndev, skb);

}



int nci_uart_register(struct nci_uart *nu)

{

	if (!nu || !nu->ops.open ||
@@ -402,10 +396,6 @@ int nci_uart_register(struct nci_uart *nu) 
	/* Set the send callback */

	nu->ops.send = nci_uart_send;



	/* Install default handlers if not overridden */

	if (!nu->ops.recv)

		nu->ops.recv = nci_uart_default_recv;



	/* Add this driver in the driver list */

	if (nci_uart_drivers[nu->driver]) {

		pr_err("driver %d is already registered\n", nu->driver);