From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>
Cc: "David Miller" <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
"Joseph CHAMG" <josright123@gmail•com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the spi tree
Date: Tue, 15 Feb 2022 13:08:58 +1100 [thread overview]
Message-ID: <20220215130858.2b821de7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1833 bytes --]
Hi all,
After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/net/ethernet/davicom/dm9051.c:1253:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
1253 | .remove = dm9051_drv_remove,
| ^~~~~~~~~~~~~~~~~
drivers/net/ethernet/davicom/dm9051.c:1253:19: note: (near initialization for 'dm9051_driver.remove')
Caused by commit
a0386bba7093 ("spi: make remove callback a void function")
interacting with commit
2dc95a4d30ed ("net: Add dm9051 driver")
from the net-next tree.
I applied the following merge resolution and can carry it until the
trees are merged.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 15 Feb 2022 13:05:41 +1100
Subject: [PATCH] fix up for "pi: make remove callback a void function"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/net/ethernet/davicom/dm9051.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c
index cee3ff499fd4..d2513c97f83e 100644
--- a/drivers/net/ethernet/davicom/dm9051.c
+++ b/drivers/net/ethernet/davicom/dm9051.c
@@ -1223,15 +1223,13 @@ static int dm9051_probe(struct spi_device *spi)
return 0;
}
-static int dm9051_drv_remove(struct spi_device *spi)
+static void dm9051_drv_remove(struct spi_device *spi)
{
struct device *dev = &spi->dev;
struct net_device *ndev = dev_get_drvdata(dev);
struct board_info *db = to_dm9051_board(ndev);
phy_disconnect(db->phydev);
-
- return 0;
}
static const struct of_device_id dm9051_match_table[] = {
--
2.34.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-02-15 2:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 2:08 Stephen Rothwell [this message]
2022-02-15 7:33 ` linux-next: build failure after merge of the spi tree Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2022-02-16 5:17 Stephen Rothwell
2022-02-16 12:20 ` André Almeida
2022-02-16 13:07 ` André Almeida
2022-02-16 16:08 ` Mark Brown
2022-02-16 16:13 ` André Almeida
2022-02-16 16:07 ` Mark Brown
2022-01-27 4:57 Stephen Rothwell
2018-08-29 0:33 Stephen Rothwell
2018-08-29 1:29 ` Baolin Wang
2017-12-22 2:18 Stephen Rothwell
2017-12-22 7:39 ` Rasmus Villemoes
2017-12-22 15:51 ` Mark Brown
2017-07-10 3:26 Stephen Rothwell
2017-07-03 3:41 Stephen Rothwell
2017-05-24 1:08 Stephen Rothwell
2017-05-24 3:29 ` Jiada Wang
2016-12-09 2:32 Stephen Rothwell
2016-12-12 2:24 ` Stephen Rothwell
2016-05-16 2:08 Stephen Rothwell
2016-05-16 10:23 ` Mark Brown
2016-01-06 3:34 Stephen Rothwell
2015-08-21 4:10 Stephen Rothwell
2015-05-12 3:14 Stephen Rothwell
2015-04-07 6:49 Stephen Rothwell
2015-01-30 3:02 Stephen Rothwell
2015-01-30 5:43 ` Ricardo Ribalda Delgado
2014-12-08 12:05 Stephen Rothwell
2014-12-08 12:13 ` Mark Brown
2014-12-08 12:54 ` Lee Jones
2014-12-08 12:58 ` Mark Brown
2014-12-08 13:56 ` Laurentiu Palcu
2014-04-15 2:17 Stephen Rothwell
2014-04-15 4:35 ` Harini Katakam
2014-02-24 3:45 Stephen Rothwell
2014-02-24 6:00 ` Mark Brown
2014-01-06 7:03 Stephen Rothwell
2014-01-06 7:09 ` Baruch Siach
2013-08-27 6:15 Stephen Rothwell
2013-08-27 7:20 ` Sourav Poddar
2013-07-29 3:42 Stephen Rothwell
2013-07-29 5:00 ` Mark Brown
2013-07-29 5:56 ` Stephen Rothwell
2013-07-29 6:40 ` Mark Brown
2013-07-29 6:48 ` Stephen Rothwell
2013-07-29 8:00 ` Mark Brown
2011-06-07 2:53 Stephen Rothwell
2011-06-07 16:51 ` Grant Likely
2010-10-14 1:55 Stephen Rothwell
2010-10-14 1:58 ` Grant Likely
2010-06-29 3:29 Stephen Rothwell
2010-06-29 5:02 ` 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=20220215130858.2b821de7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=josright123@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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