Commit 65c1736c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fix from Lee Jones:

 - Fix some -Werror=unused-variable build errors

* tag 'mfd-fixes-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: Fix building without CONFIG_OF
parents ce95858a d9d79e4f

drivers/mfd/88pm860x-core.c

+1 −2
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ static int device_irq_init(struct pm860x_chip *chip, 
	unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;

	int data, mask, ret = -EINVAL;

	int nr_irqs, irq_base = -1;

	struct device_node *node = i2c->dev.of_node;



	mask = PM8607_B0_MISC1_INV_INT | PM8607_B0_MISC1_INT_CLEAR

		| PM8607_B0_MISC1_INT_MASK;
@@ -624,7 +623,7 @@ static int device_irq_init(struct pm860x_chip *chip, 
		ret = -EBUSY;

		goto out;

	}

	irq_domain_create_legacy(of_fwnode_handle(node), nr_irqs, chip->irq_base, 0,

	irq_domain_create_legacy(dev_fwnode(&i2c->dev), nr_irqs, chip->irq_base, 0,

				 &pm860x_irq_domain_ops, chip);

	chip->core_irq = i2c->irq;

	if (!chip->core_irq)

drivers/mfd/max8925-core.c

+3 −3
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq, 
{

	unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;

	int ret;

	struct device_node *node = chip->dev->of_node;



	/* clear all interrupts */

	max8925_reg_read(chip->i2c, MAX8925_CHG_IRQ1);
@@ -682,8 +681,9 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq, 
		return -EBUSY;

	}



	irq_domain_create_legacy(of_fwnode_handle(node), MAX8925_NR_IRQS, chip->irq_base, 0,

				 &max8925_irq_domain_ops, chip);

	irq_domain_create_legacy(dev_fwnode(chip->dev), MAX8925_NR_IRQS,

				 chip->irq_base, 0, &max8925_irq_domain_ops,

				 chip);



	/* request irq handler for pmic main irq*/

	chip->core_irq = irq;

drivers/mfd/twl4030-irq.c

+1 −2
Original line number Diff line number Diff line
@@ -676,7 +676,6 @@ int twl4030_init_irq(struct device *dev, int irq_num) 
	static struct irq_chip	twl4030_irq_chip;

	int			status, i;

	int			irq_base, irq_end, nr_irqs;

	struct			device_node *node = dev->of_node;



	/*

	 * TWL core and pwr interrupts must be contiguous because
@@ -691,7 +690,7 @@ int twl4030_init_irq(struct device *dev, int irq_num) 
		return irq_base;

	}



	irq_domain_create_legacy(of_fwnode_handle(node), nr_irqs, irq_base, 0,

	irq_domain_create_legacy(dev_fwnode(dev), nr_irqs, irq_base, 0,

				 &irq_domain_simple_ops, NULL);



	irq_end = irq_base + TWL4030_CORE_NR_IRQS;