gpio: pca953x: Request IRQ after all initialisation done
Subsystems (3)
PATCH 1/3 gpio: pca953x: Request IRQ after all initialisation done
There is logically better to request IRQ when we initialise all structures. Align the driver with the rest on the same matter.
--- drivers/gpio/gpio-pca953x.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpio/gpio-pca953x.c +11 -11
@@ -865,17 +865,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base)bitmap_and (chip->irq_stat, irq_stat, reg_direction, chip->gpio_chip.ngpio);mutex_init (&chip->irq_lock); - ret =devm_request_threaded_irq (&client->dev, client->irq, -NULL , pca953x_irq_handler, -IRQF_ONESHOT |IRQF_SHARED , -dev_name (&client->dev), chip); -if (ret) { -dev_err (&client->dev,"failed to request irq %d\n" , - client->irq); -return ret; - } - - irq_chip->name =dev_name (&chip->client->dev); + irq_chip->name =dev_name (&client->dev); irq_chip->irq_mask = pca953x_irq_mask; irq_chip->irq_unmask = pca953x_irq_unmask; irq_chip->irq_set_wake = pca953x_irq_set_wake;
@@ -895,6 +885,16 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) girq->threaded = true; girq->first = irq_base;/* FIXME: get rid of this */ + ret =devm_request_threaded_irq (&client->dev, client->irq, +NULL , pca953x_irq_handler, +IRQF_ONESHOT |IRQF_SHARED , +dev_name (&client->dev), chip); +if (ret) { +dev_err (&client->dev,"failed to request irq %d\n" , + client->irq); +return ret; + } +return 0 ; }
Signature · 1 line
2.27.0
PATCH 2/3 gpio: crystalcove: Free IRQ on error path
It appears that all, but request_irq(), calls in the driver are device managed. In unlikely case of devm_gpiochip_add_data() failure the IRQ left requested. Free IRQ on error path by switching to devm_request_threaded_irq() API.
Byproduct of this change is a drop of ->remove() callback completely.
--- drivers/gpio/gpio-crystalcove.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/gpio/gpio-crystalcove.c +3 -15
@@ -364,9 +364,9 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) girq->handler = handle_simple_irq; girq->threaded = true; - retval =request_threaded_irq (irq,NULL , crystalcove_gpio_irq_handler, -IRQF_ONESHOT ,KBUILD_MODNAME , cg); - + retval =devm_request_threaded_irq (&pdev->dev, irq,NULL , + crystalcove_gpio_irq_handler, +IRQF_ONESHOT ,KBUILD_MODNAME , cg);if (retval) {dev_warn (&pdev->dev,"request irq failed: %d\n" , retval);return retval;
@@ -381,24 +381,12 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)return 0 ; } -static int crystalcove_gpio_remove (struct platform_device *pdev) -{ -struct crystalcove_gpio *cg =platform_get_drvdata (pdev); -int irq =platform_get_irq (pdev,0 ); - -if (irq >=0 ) -free_irq (irq, cg); -return 0 ; -} -static struct platform_driver crystalcove_gpio_driver = { .probe = crystalcove_gpio_probe, - .remove = crystalcove_gpio_remove, .driver = { .name ="crystal_cove_gpio" , }, }; -module_platform_driver (crystalcove_gpio_driver);MODULE_AUTHOR ("Yang, Bin <[email protected]>" );
Signature · 1 line
2.27.0
PATCH 3/3 gpio: wcove: Request IRQ after all initialisation done
In reply to Andy ShevchenkoThere is logically better to request IRQ when we initialise all structures. Align the driver with the rest on the same matter.
--- drivers/gpio/gpio-wcove.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpio/gpio-wcove.c +7 -7
@@ -449,13 +449,6 @@ static int wcove_gpio_probe(struct platform_device *pdev)return virq; } - ret =devm_request_threaded_irq (dev, virq,NULL , - wcove_gpio_irq_handler,IRQF_ONESHOT , pdev->name, wg); -if (ret) { -dev_err (dev,"Failed to request irq %d\n" , virq); -return ret; - } - girq = &wg->chip.irq; girq->chip = &wcove_irqchip;/* This will let us handle the parent IRQ in the driver */
@@ -466,6 +459,13 @@ static int wcove_gpio_probe(struct platform_device *pdev) girq->handler = handle_simple_irq; girq->threaded = true; + ret =devm_request_threaded_irq (dev, virq,NULL , wcove_gpio_irq_handler, +IRQF_ONESHOT , pdev->name, wg); +if (ret) { +dev_err (dev,"Failed to request irq %d\n" , virq); +return ret; + } + ret =devm_gpiochip_add_data (dev, &wg->chip, wg);if (ret) {dev_err (dev,"Failed to add gpiochip: %d\n" , ret);
Signature · 1 line
2.27.0
Quoted 4 lines · Andy Shevchenko
There is logically better to request IRQ when we initialise all structures. Align the driver with the rest on the same matter.
Signed-off-by Andy Shevchenko <[email protected]>
I just applied these three (despite 2 & 3 hitting Intel drivers) since we are in the
merge window and it needs to be in good shape for the merge.
Thanks!
Linus Walleij
Quoted 10 lines · Linus Walleij
Quoted 2 lines · Andy Shevchenko
There is logically better to request IRQ when we initialise all structures. Align the driver with the rest on the same matter.
I just applied these three
(despite 2 & 3 hitting Intel drivers) since
we are in the
merge window and it needs to be in good shape for the merge.
That's exactly my understanding how it has to be proceeded. Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko