Skip to content

Commit d9d79e4

Browse files
arndblag-linaro
authored andcommitted
mfd: Fix building without CONFIG_OF
Using the of_fwnode_handle() means that local 'node' variables are unused whenever CONFIG_OF is disabled for compile testing: drivers/mfd/88pm860x-core.c: In function 'device_irq_init': drivers/mfd/88pm860x-core.c:576:29: error: unused variable 'node' [-Werror=unused-variable] 576 | struct device_node *node = i2c->dev.of_node; | ^~~~ drivers/mfd/max8925-core.c: In function 'max8925_irq_init': drivers/mfd/max8925-core.c:659:29: error: unused variable 'node' [-Werror=unused-variable] 659 | struct device_node *node = chip->dev->of_node; | ^~~~ drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': drivers/mfd/twl4030-irq.c:679:46: error: unused variable 'node' [-Werror=unused-variable] 679 | struct device_node *node = dev->of_node; | ^~~~ Replace these with the corresponding dev_fwnode() lookups that keep the code simpler in addition to avoiding the warnings. Fixes: e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 19272b3 commit d9d79e4

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

drivers/mfd/88pm860x-core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,6 @@ static int device_irq_init(struct pm860x_chip *chip,
573573
unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
574574
int data, mask, ret = -EINVAL;
575575
int nr_irqs, irq_base = -1;
576-
struct device_node *node = i2c->dev.of_node;
577576

578577
mask = PM8607_B0_MISC1_INV_INT | PM8607_B0_MISC1_INT_CLEAR
579578
| PM8607_B0_MISC1_INT_MASK;
@@ -624,7 +623,7 @@ static int device_irq_init(struct pm860x_chip *chip,
624623
ret = -EBUSY;
625624
goto out;
626625
}
627-
irq_domain_create_legacy(of_fwnode_handle(node), nr_irqs, chip->irq_base, 0,
626+
irq_domain_create_legacy(dev_fwnode(&i2c->dev), nr_irqs, chip->irq_base, 0,
628627
&pm860x_irq_domain_ops, chip);
629628
chip->core_irq = i2c->irq;
630629
if (!chip->core_irq)

drivers/mfd/max8925-core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,
656656
{
657657
unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
658658
int ret;
659-
struct device_node *node = chip->dev->of_node;
660659

661660
/* clear all interrupts */
662661
max8925_reg_read(chip->i2c, MAX8925_CHG_IRQ1);
@@ -682,8 +681,9 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,
682681
return -EBUSY;
683682
}
684683

685-
irq_domain_create_legacy(of_fwnode_handle(node), MAX8925_NR_IRQS, chip->irq_base, 0,
686-
&max8925_irq_domain_ops, chip);
684+
irq_domain_create_legacy(dev_fwnode(chip->dev), MAX8925_NR_IRQS,
685+
chip->irq_base, 0, &max8925_irq_domain_ops,
686+
chip);
687687

688688
/* request irq handler for pmic main irq*/
689689
chip->core_irq = irq;

drivers/mfd/twl4030-irq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,6 @@ int twl4030_init_irq(struct device *dev, int irq_num)
676676
static struct irq_chip twl4030_irq_chip;
677677
int status, i;
678678
int irq_base, irq_end, nr_irqs;
679-
struct device_node *node = dev->of_node;
680679

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

694-
irq_domain_create_legacy(of_fwnode_handle(node), nr_irqs, irq_base, 0,
693+
irq_domain_create_legacy(dev_fwnode(dev), nr_irqs, irq_base, 0,
695694
&irq_domain_simple_ops, NULL);
696695

697696
irq_end = irq_base + TWL4030_CORE_NR_IRQS;

0 commit comments

Comments
 (0)