From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: linux-next: build failure after merge of the gpio tree
Date: Thu, 2 Nov 2017 16:20:38 +1100 [thread overview]
Message-ID: <20171102162038.339466ef@canb.auug.org.au> (raw)
Hi Linus,
After merging the gpio tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpio/gpio-uniphier.c:324:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.activate = uniphier_gpio_irq_domain_activate,
^
Caused by commit
dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver")
interacting with commit
72491643469a ("genirq/irqdomain: Update irq_domain_ops.activate() signature")
from the tip tree
I added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Nov 2017 16:10:46 +1100
Subject: [PATCH] gpio: uniphier: merge fix for "Update
irq_domain_ops.activate() signature"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpio/gpio-uniphier.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index d62cea4ed6b7..d0069202ade3 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -300,13 +300,15 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain,
return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
}
-static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
- struct irq_data *data)
+static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
+ struct irq_data *data,
+ bool early)
{
struct uniphier_gpio_priv *priv = domain->host_data;
struct gpio_chip *chip = &priv->chip;
gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
+ return 0;
}
static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,
--
2.14.1
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-11-02 5:20 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 5:20 Stephen Rothwell [this message]
2017-11-02 5:33 ` linux-next: build failure after merge of the gpio tree Masahiro Yamada
2017-11-03 7:50 ` Linus Walleij
2017-11-03 8:13 ` Stephen Rothwell
2017-11-03 21:40 ` Linus Walleij
2017-11-13 11:33 ` Stephen Rothwell
2017-11-13 13:40 ` Masahiro Yamada
-- strict thread matches above, loose matches on Subject: below --
2020-11-18 3:30 Stephen Rothwell
2020-11-18 7:50 ` Linus Walleij
2020-04-01 4:19 Stephen Rothwell
2020-04-01 7:49 ` Geert Uytterhoeven
2020-04-01 7:57 ` Stephen Rothwell
2020-04-01 8:18 ` Linus Walleij
2020-04-01 8:24 ` Geert Uytterhoeven
2020-04-01 12:29 ` Andy Shevchenko
2020-04-01 12:30 ` Andy Shevchenko
2020-04-01 8:19 ` Linus Walleij
2020-03-30 7:58 Stephen Rothwell
2020-03-30 6:11 Stephen Rothwell
2019-08-16 11:38 Stephen Rothwell
2019-08-16 22:25 ` Linus Walleij
2018-12-17 8:24 Stephen Rothwell
2018-12-10 7:00 Stephen Rothwell
2017-06-21 6:09 Stephen Rothwell
2017-06-21 6:12 ` Jisheng Zhang
2017-06-21 7:41 ` Linus Walleij
2017-05-29 5:39 Stephen Rothwell
2017-05-29 8:11 ` Linus Walleij
2017-02-08 5:11 Stephen Rothwell
2017-02-08 8:48 ` Lee Jones
2017-02-08 9:05 ` Boris Brezillon
2017-02-08 10:30 ` Stephen Rothwell
2017-02-13 15:18 ` Linus Walleij
2016-09-09 4:36 Stephen Rothwell
2016-09-12 13:27 ` Linus Walleij
2016-04-18 4:10 Stephen Rothwell
2016-03-31 2:22 Stephen Rothwell
2016-03-31 7:52 ` Linus Walleij
2016-02-16 3:48 Stephen Rothwell
2016-02-16 14:47 ` Linus Walleij
2016-01-29 1:45 Stephen Rothwell
2016-02-04 2:16 ` Stephen Rothwell
2016-02-08 17:36 ` Linus Walleij
2015-12-22 5:42 Stephen Rothwell
2015-12-22 6:57 ` Robert Jarzmik
2015-12-22 9:08 ` Linus Walleij
2015-12-22 20:10 ` Stephen Rothwell
2015-12-22 23:58 ` Linus Walleij
2015-12-23 0:20 ` Stephen Rothwell
2015-12-16 3:37 Stephen Rothwell
2015-12-16 3:55 ` Yendapally Reddy Dhananjaya Reddy
2015-12-21 5:02 ` Stephen Rothwell
2015-12-21 8:46 ` Linus Walleij
2015-12-02 23:38 Mark Brown
2015-08-31 6:40 Stephen Rothwell
2015-08-31 6:49 ` Linus Walleij
2015-08-18 6:57 Stephen Rothwell
2015-08-18 12:00 ` Linus Walleij
2015-08-18 12:23 ` Uwe Kleine-König
2015-08-18 13:35 ` Mauro Carvalho Chehab
2015-08-12 8:10 Stephen Rothwell
2015-08-12 8:21 ` Uwe Kleine-König
2015-08-12 12:27 ` Stephen Rothwell
2015-08-12 15:03 ` Stephen Rothwell
2015-08-12 20:16 ` Uwe Kleine-König
2015-08-12 23:02 ` Stephen Rothwell
2015-08-13 0:19 ` Chanwoo Choi
2015-08-13 0:50 ` Stephen Rothwell
2015-08-12 6:59 Stephen Rothwell
2015-08-10 5:07 Stephen Rothwell
2015-08-10 5:46 ` Dmitry Torokhov
2015-08-10 22:51 ` Stephen Rothwell
2015-07-21 3:29 Stephen Rothwell
2015-05-13 6:55 Stephen Rothwell
2015-05-13 7:04 ` Alexandre Courbot
2015-05-13 7:36 ` Johan Hovold
2015-04-10 9:08 Stephen Rothwell
2015-04-10 9:35 ` Linus Walleij
2014-07-29 8:31 Stephen Rothwell
2014-07-29 8:42 ` Thierry Reding
2014-08-04 4:10 ` Alexandre Courbot
2014-08-04 4:28 ` Stephen Rothwell
2014-05-14 7:13 Stephen Rothwell
2014-05-16 15:54 ` Linus Walleij
2014-01-20 5:42 Stephen Rothwell
2013-09-18 3:12 Stephen Rothwell
2013-09-18 11:24 ` Linus Walleij
2013-03-04 1:45 Stephen Rothwell
2013-03-04 2:30 ` Linus Walleij
2013-03-04 2:32 ` Grant Likely
2012-02-03 2:54 Stephen Rothwell
2012-02-03 23:18 ` Grant Likely
2012-02-04 12:10 ` Mark Brown
2011-10-06 3:48 Stephen Rothwell
2011-10-11 6:37 ` Stephen Rothwell
2011-10-11 7:02 ` Tomoya MORINAGA
2011-10-12 4:24 ` Stephen Rothwell
2011-10-12 5:29 ` Tomoya MORINAGA
2011-10-12 7:21 ` Nobuhiro Iwamatsu
2011-10-12 8:37 ` Tomoya MORINAGA
2011-10-13 3:57 ` Grant Likely
2011-10-13 8:22 ` Tomoya MORINAGA
2011-10-13 17:31 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171102162038.339466ef@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).