linux-next: build failure after merge of the mfd tree

Stephen Rothwell
2023-04-06T02:01:03Z

[-- Attachment #1: Type: text/plain, Size: 1890 bytes --]

Hi all,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/qcom-pm8008.c:135:35: error: initialization of 'int (*)(unsigned int **, unsigned int, const struct regmap_irq *, int, void *)' from incompatible pointer type 'int (*)(unsigned int **, unsigned int, const struct regmap_irq *, int)' [-Werror=incompatible-pointer-types]
135 | .set_type_config = pm8008_set_type_config,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/mfd/qcom-pm8008.c:135:35: note: (near initialization for 'pm8008_irq_chip.set_type_config')

Caused by commit

72a8a08b0c62 ("mfd: qcom-pm8008: Convert irq chip to config regs")

interacting with commit

7697c64b9e49 ("regmap: Pass irq_drv_data as a parameter for set_type_config()")

from the regmap tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Apr 2023 11:37:44 +1000
Subject: [PATCH] fixup for "mfd: qcom-pm8008: Convert irq chip to config regs"

interacting with "regmap: Pass irq_drv_data as a parameter for set_type_config()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/mfd/qcom-pm8008.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index a33fbc42ac8e..e60c838a78c1 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -85,7 +85,8 @@ static unsigned int pm8008_get_irq_reg(struct regmap_irq_chip_data *data,
}

static int pm8008_set_type_config(unsigned int **buf, unsigned int type,
- const struct regmap_irq *irq_data, int idx)
+ const struct regmap_irq *irq_data, int idx,
+ void *irq_drv_data)
{
switch (type) {
case IRQ_TYPE_EDGE_FALLING:
--
2.39.2

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]