Hi, On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the mhi tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 27 | .auto_start = false, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 42 | .auto_start = false, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 57 | .auto_start = true, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 72 | .auto_start = true, > | ^~~~~~~~~~ > > Caused by commit > > ed39d7816885 ("bus: mhi: Remove auto-start option") > > interacting with commit > > 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390") > > from the net-next tree. > > I applied the following merge fix patch, but maybe more is required. > Even if so, this could be fixed now in the net-next tree. > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Mon, 28 Sep 2020 18:39:41 +1000 > Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390" > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Sorry, I forgot to submit a patch against net-next for fixing this while merging the MHI change. But your change looks good and I can just modify the subject/description and resubmit. Or if Dave prefers to fix the original commit itself in net-next, I'm fine! Thanks, Mani > --- > drivers/net/wireless/ath/ath11k/mhi.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c > index aded9a719d51..47a1ce1bee4f 100644 > --- a/drivers/net/wireless/ath/ath11k/mhi.c > +++ b/drivers/net/wireless/ath/ath11k/mhi.c > @@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = false, > }, > { > .num = 1, > @@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = false, > }, > { > .num = 20, > @@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = true, > }, > { > .num = 21, > @@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = true, > - .auto_start = true, > }, > }; > > -- > 2.28.0 > > -- > Cheers, > Stephen Rothwell