Skip to content

Commit 751eb99

Browse files
Bartosz Golaszewskijfvogel
authored andcommitted
gpio: vf610: use generic device_get_match_data()
[ Upstream commit 1b35c12 ] There's no need to use the OF-specific variant to get the match data. Switch to using device_get_match_data() and with that remove the of.h include. Also remove of_irq.h as none of its interfaces is used here and order the includes in alphabetical order. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20241007102549.34926-1-brgl@bgdev.pl Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Stable-dep-of: 4e667a1 ("gpio: vf610: add locking to gpio direction functions") Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 5d473aefbcd3c772d085e2124b91174c87bf8d3b) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 10653ce commit 751eb99

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/gpio/gpio-vf610.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
#include <linux/io.h>
1616
#include <linux/ioport.h>
1717
#include <linux/irq.h>
18-
#include <linux/platform_device.h>
19-
#include <linux/of.h>
20-
#include <linux/of_irq.h>
2118
#include <linux/pinctrl/consumer.h>
19+
#include <linux/platform_device.h>
20+
#include <linux/property.h>
2221

2322
#define VF610_GPIO_PER_PORT 32
2423

@@ -297,7 +296,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
297296
if (!port)
298297
return -ENOMEM;
299298

300-
port->sdata = of_device_get_match_data(dev);
299+
port->sdata = device_get_match_data(dev);
301300

302301
dual_base = port->sdata->have_dual_base;
303302

0 commit comments

Comments
 (0)