Skip to contentSkip to conversation

pinctrl: baytrail: Use platform_get_irq_optional() explicitly

PATCH In review Andy Shevchenko 3 participants 6 messages Apr 14, 2020 – Apr 16, 2020

Subsystems (3)
GPIO Pin control Pin controller - Intel
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/2 pinctrl: baytrail: Use platform_get_irq_optional() explicitly

There is no need to repeat functionality of platform_get_irq_optional() in the driver. Replace it with explicit call to the helper.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/pinctrl/intel/pinctrl-baytrail.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pinctrl/intel/pinctrl-baytrail.c +4 -5
index 9b821c9cbd16..0ff7c55173da 100644
@@ -1506,8 +1506,7 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
 {
 	struct platform_device *pdev = to_platform_device(vg->dev);
 	struct gpio_chip *gc;
-	struct resource *irq_rc;
-	int ret;
+	int irq, ret;
 
 	/* Set up gpio chip */
 	vg->chip	= byt_gpio_chip;

@@ -1527,8 +1526,8 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
 #endif
 
 	/* set up interrupts  */
-	irq_rc = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (irq_rc && irq_rc->start) {
+	irq = platform_get_irq_optional(pdev, 0);
+	if (irq > 0) {
 		struct gpio_irq_chip *girq;
 
 		vg->irqchip.name = "BYT-GPIO",

@@ -1548,7 +1547,7 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
 					     sizeof(*girq->parents), GFP_KERNEL);
 		if (!girq->parents)
 			return -ENOMEM;
-		girq->parents[0] = (unsigned int)irq_rc->start;
+		girq->parents[0] = irq;
 		girq->default_type = IRQ_TYPE_NONE;
 		girq->handler = handle_bad_irq;
 	}
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 pinctrl: lynxpoint: Use platform_get_irq_optional() explicitly

There is no need to repeat functionality of platform_get_irq_optional() in the driver. Replace it with explicit call to the helper.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pinctrl/intel/pinctrl-lynxpoint.c +5 -5
index e928742c7181..a45b8f2182fd 100644
@@ -794,11 +794,11 @@ static int lp_gpio_probe(struct platform_device *pdev)
 	const struct intel_pinctrl_soc_data *soc;
 	struct intel_pinctrl *lg;
 	struct gpio_chip *gc;
-	struct resource *io_rc, *irq_rc;
 	struct device *dev = &pdev->dev;
+	struct resource *io_rc;
 	void __iomem *regs;
 	unsigned int i;
-	int ret;
+	int irq, ret;
 
 	soc = (const struct intel_pinctrl_soc_data *)device_get_match_data(dev);
 	if (!soc)

@@ -870,8 +870,8 @@ static int lp_gpio_probe(struct platform_device *pdev)
 	gc->parent = dev;
 
 	/* set up interrupts  */
-	irq_rc = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (irq_rc && irq_rc->start) {
+	irq = platform_get_irq_optional(pdev, 0);
+	if (irq > 0) {
 		struct gpio_irq_chip *girq;
 
 		girq = &gc->irq;

@@ -884,7 +884,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
 					     GFP_KERNEL);
 		if (!girq->parents)
 			return -ENOMEM;
-		girq->parents[0] = (unsigned int)irq_rc->start;
+		girq->parents[0] = irq;
 		girq->default_type = IRQ_TYPE_NONE;
 		girq->handler = handle_bad_irq;
 	}
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH v1 2/2] pinctrl: lynxpoint: Use platform_get_irq_optional() explicitly

In reply to Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

There is no need to repeat functionality of platform_get_irq_optional() in the driver. Replace it with explicit call to the helper.

Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Linus Walleij <[email protected]>

For all Intel pinctrl patches I will occasionally review and othewise just wait for your pull requests.

Yours,
Linus Walleij