gpio: bcm-kona: Make driver OF-independent
PATCH v3 1/3 gpio: bcm-kona: Make driver OF-independent
There is nothing in the driver that requires OF APIs, make the driver OF independent.
---
v2: new patch
v3: fixed compilation error (LKP)
drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-bcm-kona.c | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-)
drivers/gpio/Kconfig +1 -1
@@ -191,7 +191,7 @@ config GPIO_RASPBERRYPI_EXP config GPIO_BCM_KONA bool "Broadcom Kona GPIO" - depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST) + depends on ARCH_BCM_MOBILE || COMPILE_TEST help Turn on GPIO support for Broadcom "Kona" chips.
drivers/gpio/gpio-bcm-kona.c +8 -13
@@ -8,12 +8,14 @@#include <linux/bitops.h> #include <linux/err.h> -#include <linux/io.h> #include <linux/gpio/driver.h> -#include <linux/of_device.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> +#include <linux/mod_devicetable.h> +#include <linux/platform_device.h> +#include <linux/property.h> #define BCM_GPIO_PASSWD 0x00a5a501#define GPIO_PER_BANK 32
@@ -556,19 +558,12 @@ static void bcm_kona_gpio_reset(struct bcm_kona_gpio *kona_gpio)static int bcm_kona_gpio_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; -const struct of_device_id *match;struct bcm_kona_gpio_bank *bank;struct bcm_kona_gpio *kona_gpio;struct gpio_chip *chip;int ret;int i; - match =of_match_device (bcm_kona_gpio_of_match, dev); -if (!match) { -dev_err (dev,"Failed to find gpio controller\n" ); -return -ENODEV ; - } - kona_gpio =devm_kzalloc (dev,sizeof (*kona_gpio),GFP_KERNEL );if (!kona_gpio)return -ENOMEM ;
@@ -601,10 +596,10 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) chip->parent = dev; chip->ngpio = kona_gpio->num_bank *GPIO_PER_BANK ; - kona_gpio->irq_domain =irq_domain_add_linear (dev->of_node, - chip->ngpio, - &bcm_kona_irq_ops, - kona_gpio); + kona_gpio->irq_domain =irq_domain_create_linear (dev_fwnode (dev), + chip->ngpio, + &bcm_kona_irq_ops, + kona_gpio);if (!kona_gpio->irq_domain) {dev_err (dev,"Couldn't allocate IRQ domain\n" );return -ENXIO ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v3 3/3 gpio: bcm-kona: Drop unused pdev member in private data structure
The pdev member is assigned and not used, drop it.
---
v2: new patch
v3: no changes
drivers/gpio/gpio-bcm-kona.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpio/gpio-bcm-kona.c +0 -2
@@ -64,7 +64,6 @@ struct bcm_kona_gpio {struct gpio_chip gpio_chip;struct irq_domain *irq_domain;struct bcm_kona_gpio_bank *banks; -struct platform_device *pdev; };struct bcm_kona_gpio_bank {
@@ -591,7 +590,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)if (!kona_gpio->banks)return -ENOMEM ; - kona_gpio->pdev = pdev; chip->parent = dev; chip->ngpio = kona_gpio->num_bank *GPIO_PER_BANK ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v3 2/3 gpio: bcm-kona: remove unneeded platform_set_drvdata() call
In reply to Andy ShevchenkoFrom: Andrei Coardos <[email protected]>
The platform_set_drvdata() call was never used, ever since the driver was originally added.
It looks like this copy+paste left-over. Possibly the author copied from a driver that had this line, but also had a remove hook.
---
v2: no changes
v3: no changes
drivers/gpio/gpio-bcm-kona.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpio/gpio-bcm-kona.c +0 -1
@@ -592,7 +592,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)return -ENOMEM ; kona_gpio->pdev = pdev; -platform_set_drvdata (pdev, kona_gpio); chip->parent = dev; chip->ngpio = kona_gpio->num_bank *GPIO_PER_BANK ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
Quoted 6 lines · Andy Shevchenko
There is nothing in the driver that requires OF APIs, make the driver OF independent.
Signed-off-by Andy Shevchenko <[email protected]>---
Series applied, thanks!
Bart