pinctrl: pic32: Pass irqchip when adding gpiochip (835513b0) · Commits · 戴 / test

drivers/pinctrl/pinctrl-pic32.c

+12 −13

Original line number	Diff line number	Diff line
		@@ -2203,6 +2203,7 @@ static int pic32_gpio_probe(struct platform_device *pdev)
		u32 id;
		int irq, ret;
		struct resource *res;
		struct gpio_irq_chip *girq;

		if (of_property_read_u32(np, "microchip,gpio-bank", &id)) {
		dev_err(&pdev->dev, "microchip,gpio-bank property not found\n");
		@@ -2240,25 +2241,23 @@ static int pic32_gpio_probe(struct platform_device *pdev)

		bank->gpio_chip.parent = &pdev->dev;
		bank->gpio_chip.of_node = np;
		girq = &bank->gpio_chip.irq;
		girq->chip = &bank->irq_chip;
		girq->parent_handler = pic32_gpio_irq_handler;
		girq->num_parents = 1;
		girq->parents = devm_kcalloc(&pdev->dev, 1, sizeof(*girq->parents),
		GFP_KERNEL);
		if (!girq->parents)
		return -ENOMEM;
		girq->default_type = IRQ_TYPE_NONE;
		girq->handler = handle_level_irq;
		girq->parents[0] = irq;
		ret = gpiochip_add_data(&bank->gpio_chip, bank);
		if (ret < 0) {
		dev_err(&pdev->dev, "Failed to add GPIO chip %u: %d\n",
		id, ret);
		return ret;
		}

		ret = gpiochip_irqchip_add(&bank->gpio_chip, &bank->irq_chip,
		0, handle_level_irq, IRQ_TYPE_NONE);
		if (ret < 0) {
		dev_err(&pdev->dev, "Failed to add IRQ chip %u: %d\n",
		id, ret);
		gpiochip_remove(&bank->gpio_chip);
		return ret;
		}

		gpiochip_set_chained_irqchip(&bank->gpio_chip, &bank->irq_chip,
		irq, pic32_gpio_irq_handler);

		return 0;
		}