From cb2f0df78455d1c417bbcc150ac76cd2da7da397 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Apr 2020 20:53:56 +0200 Subject: [PATCH] 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 --- .../144-add-removed-syscon_regmap_lookup_by_pdevname.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 --- a/drivers/mfd/syscon.c @@ -16,7 +20,7 @@ Signed-off-by: Adrian Schmutzler } 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); +} -- 2.25.1