From 0fe3bf3fcbd38a7d2718e044328f595219fcc466 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 15 Apr 2013 22:39:26 +0200 Subject: backports: backport class_find_device properly Instead of patching, make a macro that casts the const out from the function pointer arguments to avoid the warning. Signed-off-by: Johannes Berg --- .../nfc/03-driver-core-constify-data/INFO | 7 ------- .../nfc/03-driver-core-constify-data/net_nfc_core.patch | 14 -------------- 2 files changed, 21 deletions(-) delete mode 100644 patches/collateral-evolutions/nfc/03-driver-core-constify-data/INFO delete mode 100644 patches/collateral-evolutions/nfc/03-driver-core-constify-data/net_nfc_core.patch (limited to 'patches/collateral-evolutions/nfc') diff --git a/patches/collateral-evolutions/nfc/03-driver-core-constify-data/INFO b/patches/collateral-evolutions/nfc/03-driver-core-constify-data/INFO deleted file mode 100644 index 79266124..00000000 --- a/patches/collateral-evolutions/nfc/03-driver-core-constify-data/INFO +++ /dev/null @@ -1,7 +0,0 @@ -This backports: - -commit 9f3b795a626ee79574595e06d1437fe0c7d51d29 -Author: Michał Mirosław -Date: Fri Feb 1 20:40:17 2013 +0100 - - driver-core: constify data for class_find_device() diff --git a/patches/collateral-evolutions/nfc/03-driver-core-constify-data/net_nfc_core.patch b/patches/collateral-evolutions/nfc/03-driver-core-constify-data/net_nfc_core.patch deleted file mode 100644 index d09365f6..00000000 --- a/patches/collateral-evolutions/nfc/03-driver-core-constify-data/net_nfc_core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/nfc/core.c -+++ b/net/nfc/core.c -@@ -732,7 +732,11 @@ struct class nfc_class = { - }; - EXPORT_SYMBOL(nfc_class); - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) - static int match_idx(struct device *d, const void *data) -+#else -+static int match_idx(struct device *d, void *data) -+#endif - { - struct nfc_dev *dev = to_nfc_dev(d); - const unsigned int *idx = data; -- cgit v1.2.3