| Message ID | 20250508-mfd-fix-unused-node-variables-v1-1-df84d80cca55@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | mfd: Remove node variables that are unused with CONFIG_OF=n | expand |
On 08. 05. 25, 17:57, Nathan Chancellor wrote: > A recent cleanup introduced a few instances of -Wunused-variable in > configurations without CONFIG_OF because of_fwnode_handle() does not > reference its argument in that case: > > drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': > drivers/mfd/twl4030-irq.c:679:46: warning: unused variable 'node' [-Wunused-variable] > 679 | struct device_node *node = dev->of_node; > | ^~~~ > drivers/mfd/max8925-core.c: In function 'max8925_irq_init': > drivers/mfd/max8925-core.c:659:29: warning: unused variable 'node' [-Wunused-variable] > 659 | struct device_node *node = chip->dev->of_node; > | ^~~~ > drivers/mfd/88pm860x-core.c: In function 'device_irq_init': > drivers/mfd/88pm860x-core.c:576:29: warning: unused variable 'node' [-Wunused-variable] > 576 | struct device_node *node = i2c->dev.of_node; > | ^~~~ > > Use the value of these variables as the argument to of_fwnode_handle() > directly, clearing up the warnings. It's good on its own. Reviewed-by: Jiri Slaby <jirislaby@kernel.org> Though, I have a series to convert to dev_fwnode() in (I think) all the cases. thanks,
On Thu, 08 May 2025, Nathan Chancellor wrote: > A recent cleanup introduced a few instances of -Wunused-variable in > configurations without CONFIG_OF because of_fwnode_handle() does not > reference its argument in that case: > > drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': > drivers/mfd/twl4030-irq.c:679:46: warning: unused variable 'node' [-Wunused-variable] > 679 | struct device_node *node = dev->of_node; > | ^~~~ > drivers/mfd/max8925-core.c: In function 'max8925_irq_init': > drivers/mfd/max8925-core.c:659:29: warning: unused variable 'node' [-Wunused-variable] > 659 | struct device_node *node = chip->dev->of_node; > | ^~~~ > drivers/mfd/88pm860x-core.c: In function 'device_irq_init': > drivers/mfd/88pm860x-core.c:576:29: warning: unused variable 'node' [-Wunused-variable] > 576 | struct device_node *node = i2c->dev.of_node; > | ^~~~ > > Use the value of these variables as the argument to of_fwnode_handle() > directly, clearing up the warnings. > > Fixes: e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/mfd/88pm860x-core.c | 5 ++--- > drivers/mfd/max8925-core.c | 5 ++--- > drivers/mfd/twl4030-irq.c | 5 ++--- > 3 files changed, 6 insertions(+), 9 deletions(-) Doesn't apply. Which base commit / repo / branch are you using?
On Tue, May 13, 2025 at 10:47:26AM +0100, Lee Jones wrote: > On Thu, 08 May 2025, Nathan Chancellor wrote: > > > A recent cleanup introduced a few instances of -Wunused-variable in > > configurations without CONFIG_OF because of_fwnode_handle() does not > > reference its argument in that case: > > > > drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': > > drivers/mfd/twl4030-irq.c:679:46: warning: unused variable 'node' [-Wunused-variable] > > 679 | struct device_node *node = dev->of_node; > > | ^~~~ > > drivers/mfd/max8925-core.c: In function 'max8925_irq_init': > > drivers/mfd/max8925-core.c:659:29: warning: unused variable 'node' [-Wunused-variable] > > 659 | struct device_node *node = chip->dev->of_node; > > | ^~~~ > > drivers/mfd/88pm860x-core.c: In function 'device_irq_init': > > drivers/mfd/88pm860x-core.c:576:29: warning: unused variable 'node' [-Wunused-variable] > > 576 | struct device_node *node = i2c->dev.of_node; > > | ^~~~ > > > > Use the value of these variables as the argument to of_fwnode_handle() > > directly, clearing up the warnings. > > > > Fixes: e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > --- > > drivers/mfd/88pm860x-core.c | 5 ++--- > > drivers/mfd/max8925-core.c | 5 ++--- > > drivers/mfd/twl4030-irq.c | 5 ++--- > > 3 files changed, 6 insertions(+), 9 deletions(-) > > Doesn't apply. Which base commit / repo / branch are you using? -tip's irq/cleanups branch: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=irq/cleanups This change has both a base commit and a Fixes tag and you were on Cc, not To. Is there anything else I can do (aside from a note in the scissor area) to signal that you don't need to handle this change? Cheers, Nathan
On Tue, 13 May 2025, Nathan Chancellor wrote: > On Tue, May 13, 2025 at 10:47:26AM +0100, Lee Jones wrote: > > On Thu, 08 May 2025, Nathan Chancellor wrote: > > > > > A recent cleanup introduced a few instances of -Wunused-variable in > > > configurations without CONFIG_OF because of_fwnode_handle() does not > > > reference its argument in that case: > > > > > > drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': > > > drivers/mfd/twl4030-irq.c:679:46: warning: unused variable 'node' [-Wunused-variable] > > > 679 | struct device_node *node = dev->of_node; > > > | ^~~~ > > > drivers/mfd/max8925-core.c: In function 'max8925_irq_init': > > > drivers/mfd/max8925-core.c:659:29: warning: unused variable 'node' [-Wunused-variable] > > > 659 | struct device_node *node = chip->dev->of_node; > > > | ^~~~ > > > drivers/mfd/88pm860x-core.c: In function 'device_irq_init': > > > drivers/mfd/88pm860x-core.c:576:29: warning: unused variable 'node' [-Wunused-variable] > > > 576 | struct device_node *node = i2c->dev.of_node; > > > | ^~~~ > > > > > > Use the value of these variables as the argument to of_fwnode_handle() > > > directly, clearing up the warnings. > > > > > > Fixes: e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") > > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > > --- > > > drivers/mfd/88pm860x-core.c | 5 ++--- > > > drivers/mfd/max8925-core.c | 5 ++--- > > > drivers/mfd/twl4030-irq.c | 5 ++--- > > > 3 files changed, 6 insertions(+), 9 deletions(-) > > > > Doesn't apply. Which base commit / repo / branch are you using? > > -tip's irq/cleanups branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=irq/cleanups > > This change has both a base commit and a Fixes tag and you were on Cc, > not To. Is there anything else I can do (aside from a note in the > scissor area) to signal that you don't need to handle this change? Wait what! This is not okay. e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") should not have been applied without at least an MFD Ack. Preferably it would have been applied to an MFD based immutable branch where it could have been shared from (if required). It was missed because the submitted patch had an "irqdomain" prefix. And now we're in a position where conflicts are likely to occur.
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 488e346047c1..25300b53a8ef 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -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,8 +623,8 @@ 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, - &pm860x_irq_domain_ops, chip); + irq_domain_create_legacy(of_fwnode_handle(i2c->dev.of_node), nr_irqs, + chip->irq_base, 0, &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq; if (!chip->core_irq) goto out; diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 78b16c67a5fc..91388477ad2b 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c @@ -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,8 @@ 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(of_fwnode_handle(chip->dev->of_node), MAX8925_NR_IRQS, + chip->irq_base, 0, &max8925_irq_domain_ops, chip); /* request irq handler for pmic main irq*/ chip->core_irq = irq; diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 232c2bfe8c18..c7191d2992a1 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -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,8 +690,8 @@ 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_simple_ops, NULL); + irq_domain_create_legacy(of_fwnode_handle(dev->of_node), nr_irqs, + irq_base, 0, &irq_domain_simple_ops, NULL); irq_end = irq_base + TWL4030_CORE_NR_IRQS;
A recent cleanup introduced a few instances of -Wunused-variable in configurations without CONFIG_OF because of_fwnode_handle() does not reference its argument in that case: drivers/mfd/twl4030-irq.c: In function 'twl4030_init_irq': drivers/mfd/twl4030-irq.c:679:46: warning: unused variable 'node' [-Wunused-variable] 679 | struct device_node *node = dev->of_node; | ^~~~ drivers/mfd/max8925-core.c: In function 'max8925_irq_init': drivers/mfd/max8925-core.c:659:29: warning: unused variable 'node' [-Wunused-variable] 659 | struct device_node *node = chip->dev->of_node; | ^~~~ drivers/mfd/88pm860x-core.c: In function 'device_irq_init': drivers/mfd/88pm860x-core.c:576:29: warning: unused variable 'node' [-Wunused-variable] 576 | struct device_node *node = i2c->dev.of_node; | ^~~~ Use the value of these variables as the argument to of_fwnode_handle() directly, clearing up the warnings. Fixes: e3d44f11da04 ("mfd: Switch to irq_domain_create_*()") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/mfd/88pm860x-core.c | 5 ++--- drivers/mfd/max8925-core.c | 5 ++--- drivers/mfd/twl4030-irq.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) --- base-commit: c63e393a16c9c4cf8c9b70fedf9f27b442874ef2 change-id: 20250508-mfd-fix-unused-node-variables-14fe4f2cfd6c Best regards,