summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev2024-09-07 21:11:19 +0000
committerRobert Marko2024-09-23 16:22:07 +0000
commit7c9998f7133b0fdc08956634de792ea41a2e0e6a (patch)
treecc7879929bf542d643f928c18ccb96031b853b16
parent2eb39308c946b99947136e4c841959e0a8c4537d (diff)
downloadopenwrt-7c9998f7133b0fdc08956634de792ea41a2e0e6a.tar.gz
gpio-button-hotplug: use dev_err_probe
Avoids having to handle EPROBE_DEFER manually. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16456 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--package/kernel/gpio-button-hotplug/Makefile2
-rw-r--r--package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/package/kernel/gpio-button-hotplug/Makefile b/package/kernel/gpio-button-hotplug/Makefile
index 04cbb69ada..5b4085887d 100644
--- a/package/kernel/gpio-button-hotplug/Makefile
+++ b/package/kernel/gpio-button-hotplug/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=gpio-button-hotplug
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 17748219e8..de100777f2 100644
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -525,10 +525,9 @@ static int gpio_keys_button_probe(struct platform_device *pdev,
button->active_low ? GPIOF_ACTIVE_LOW :
0), desc);
if (error) {
- if (error != -EPROBE_DEFER) {
- dev_err(dev, "unable to claim gpio %d, err=%d\n",
- button->gpio, error);
- }
+ dev_err_probe(dev, error,
+ "unable to claim gpio %d",
+ button->gpio);
goto out;
}