gpio-button-hotplug: enable get_devtree_pdata everywhere
Upstream prefers fwnode helpers instead of OF ones (already done). This is important for software nodes, which upstream is migrating to for its non OF devices. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/24348 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
This commit is contained in:
parent
7d56dfdca9
commit
aa09799aa2
2 changed files with 1 additions and 11 deletions
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=gpio-button-hotplug
|
PKG_NAME:=gpio-button-hotplug
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
|
||||||
|
|
@ -359,7 +359,6 @@ static irqreturn_t button_handle_irq(int irq, void *_bdata)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
|
||||||
static struct gpio_keys_platform_data *
|
static struct gpio_keys_platform_data *
|
||||||
gpio_keys_get_devtree_pdata(struct device *dev)
|
gpio_keys_get_devtree_pdata(struct device *dev)
|
||||||
{
|
{
|
||||||
|
|
@ -430,15 +429,6 @@ static const struct of_device_id gpio_keys_polled_of_match[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match);
|
MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match);
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
static inline struct gpio_keys_platform_data *
|
|
||||||
gpio_keys_get_devtree_pdata(struct device *dev)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int gpio_keys_button_probe(struct platform_device *pdev,
|
static int gpio_keys_button_probe(struct platform_device *pdev,
|
||||||
struct gpio_keys_button_dev **_bdev, int polled)
|
struct gpio_keys_button_dev **_bdev, int polled)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue