aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-03 20:53:56 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-12 12:45:56 +0200
commitcb2f0df78455d1c417bbcc150ac76cd2da7da397 (patch)
tree50bb54b48a75cceac379726a9b756493b09f3837 /target
parent8a2118e1b44fd2f385d621683927fdf3ae713379 (diff)
downloadupstream-cb2f0df78455d1c417bbcc150ac76cd2da7da397.tar.gz
upstream-cb2f0df78455d1c417bbcc150ac76cd2da7da397.tar.bz2
upstream-cb2f0df78455d1c417bbcc150ac76cd2da7da397.zip
bcm63xx: 5.4: fix compilation for changed driver_find_device
In kernel patch 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()") the arguments of functions used with driver_find_device are adjusted. Do the same for our local user. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch6
1 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch
index ef246fafd4..490558362b 100644
--- a/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch
+++ b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch
@@ -8,6 +8,10 @@ of users.
Thus, we have to maintain it locally.
+This patch includes a fix due to changes in driver_find_device;
+kernel commit: 92ce7e83b4e5 ("driver_find_device: Unify the match function
+with class_find_device()")
+
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
--- a/drivers/mfd/syscon.c
@@ -16,7 +20,7 @@ Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
}
EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible);
-+static int syscon_match_pdevname(struct device *dev, void *data)
++static int syscon_match_pdevname(struct device *dev, const void *data)
+{
+ return !strcmp(dev_name(dev), (const char *)data);
+}