From 3ae3cf6154a6d4e929396f2694b68714a9ce237b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 23 Sep 2018 19:45:27 +0200 Subject: backports: Remove NFC support I am not aware of any user of the NFC coded in backports, at least I haven't seen any patches regarding this. Remove this code to reduce the efforts needed in the backports project. Signed-off-by: Hauke Mehrtens Signed-off-by: Johannes Berg --- patches/0013-fix-makefile-includes/mei_phy.patch | 10 -------- patches/0059-uuid-in-mei/nfc.patch | 32 ------------------------ patches/0061-termios_rwsem/nfc.patch | 20 --------------- patches/0081-proto_ops-accept/nfc.patch | 16 ------------ 4 files changed, 78 deletions(-) delete mode 100644 patches/0013-fix-makefile-includes/mei_phy.patch delete mode 100644 patches/0059-uuid-in-mei/nfc.patch delete mode 100644 patches/0061-termios_rwsem/nfc.patch delete mode 100644 patches/0081-proto_ops-accept/nfc.patch (limited to 'patches') diff --git a/patches/0013-fix-makefile-includes/mei_phy.patch b/patches/0013-fix-makefile-includes/mei_phy.patch deleted file mode 100644 index c05f6eac..00000000 --- a/patches/0013-fix-makefile-includes/mei_phy.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/nfc/mei_phy.c -+++ b/drivers/nfc/mei_phy.c -@@ -19,6 +19,7 @@ - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - diff --git a/patches/0059-uuid-in-mei/nfc.patch b/patches/0059-uuid-in-mei/nfc.patch deleted file mode 100644 index 9953c819..00000000 --- a/patches/0059-uuid-in-mei/nfc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/drivers/nfc/microread/mei.c -+++ b/drivers/nfc/microread/mei.c -@@ -67,7 +67,13 @@ static int microread_mei_remove(struct m - } - - static struct mei_cl_device_id microread_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { MICROREAD_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { MICROREAD_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } ---- a/drivers/nfc/pn544/mei.c -+++ b/drivers/nfc/pn544/mei.c -@@ -67,7 +67,13 @@ static int pn544_mei_remove(struct mei_c - } - - static struct mei_cl_device_id pn544_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { PN544_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { PN544_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { PN544_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } diff --git a/patches/0061-termios_rwsem/nfc.patch b/patches/0061-termios_rwsem/nfc.patch deleted file mode 100644 index c8ad8b46..00000000 --- a/patches/0061-termios_rwsem/nfc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/net/nfc/nci/uart.c -+++ b/net/nfc/nci/uart.c -@@ -439,9 +439,17 @@ void nci_uart_set_config(struct nci_uart - if (!nu->tty) - return; - -+#if LINUX_VERSION_IS_GEQ(3,12,0) - down_read(&nu->tty->termios_rwsem); -+#else -+ mutex_lock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - new_termios = nu->tty->termios; -+#if LINUX_VERSION_IS_GEQ(3,12,0) - up_read(&nu->tty->termios_rwsem); -+#else -+ mutex_unlock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - tty_termios_encode_baud_rate(&new_termios, baudrate, baudrate); - - if (flow_ctrl) diff --git a/patches/0081-proto_ops-accept/nfc.patch b/patches/0081-proto_ops-accept/nfc.patch deleted file mode 100644 index 05b55805..00000000 --- a/patches/0081-proto_ops-accept/nfc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c -index 043c6d3..5b4e44c 100644 ---- a/net/nfc/llcp_sock.c -+++ b/net/nfc/llcp_sock.c -@@ -443,7 +443,11 @@ struct sock *nfc_llcp_accept_dequeue(str - } - - static int llcp_sock_accept(struct socket *sock, struct socket *newsock, -+#if LINUX_VERSION_IS_GEQ(4,11,0) - int flags, bool kern) -+#else -+ int flags) -+#endif - { - DECLARE_WAITQUEUE(wait, current); - struct sock *sk = sock->sk, *new_sk; -- cgit v1.2.3