| Message ID | 20210827122252.3d310dca@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: build failure after merge of the net-next tree | expand |
diff --git a/drivers/net/wwan/mhi_wwan_mbim.c b/drivers/net/wwan/mhi_wwan_mbim.c index 377529bbf124..71bf9b4f769f 100644 --- a/drivers/net/wwan/mhi_wwan_mbim.c +++ b/drivers/net/wwan/mhi_wwan_mbim.c @@ -609,7 +609,7 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id INIT_DELAYED_WORK(&mbim->rx_refill, mhi_net_rx_refill_work); /* Start MHI channels */ - err = mhi_prepare_for_transfer(mhi_dev, 0); + err = mhi_prepare_for_transfer(mhi_dev); if (err) return err;
Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe': drivers/net/wwan/mhi_wwan_mbim.c:612:8: error: too many arguments to function 'mhi_prepare_for_transfer' 612 | err = mhi_prepare_for_transfer(mhi_dev, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wwan/mhi_wwan_mbim.c:18: include/linux/mhi.h:725:5: note: declared here 725 | int mhi_prepare_for_transfer(struct mhi_device *mhi_dev); | ^~~~~~~~~~~~~~~~~~~~~~~~ Caused by commits aa730a9905b7 ("net: wwan: Add MHI MBIM network driver") ab996c420508 ("wwan: mhi: Fix build.") a85b99ab6abb ("Revert "wwan: mhi: Fix build."") 0ca8d3ca4561 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") interacting with commit 9ebc2758d0bb ("Revert "net: really fix the build..."") from Linus' tree. I have applied the following merge fix patch for today. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 27 Aug 2021 12:02:29 +1000 Subject: [PATCH] fix for commit 9ebc2758d0bb "Revert "net: really fix the build..."" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/wwan/mhi_wwan_mbim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)