From patchwork Mon Sep 28 08:42:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1372435 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=TPWRamYi; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C0GHM50Lkz9sTt for ; Mon, 28 Sep 2020 18:42:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726614AbgI1Img (ORCPT ); Mon, 28 Sep 2020 04:42:36 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:49243 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726328AbgI1Img (ORCPT ); Mon, 28 Sep 2020 04:42:36 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4C0GHF5fTzz9sSn; Mon, 28 Sep 2020 18:42:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601282554; bh=oI89Ok1pseC6DVJOwSzBhIBoDATWkXUIOB5Dgi05l6E=; h=Date:From:To:Cc:Subject:From; b=TPWRamYioOmIiF2O7SuBLVjQ/uj1oOwAD0vtRXE5lU6yYuCMrwgLEp5/rcSC2HpMQ TS4k6Mucm4mNdQLuOE1+OY8mIvzBL7Nxy3V3nWO5A6EOCPo5UneRc0iiHqgnOa9yrp rJ/5MC65agUws46+DMAL+nIxVFjvDH+MIYwgBFgsB2NHZ2NlH7gAUOMSLP/4nX0CON Yu9KX49u9ALq7Hgnk1pHLeMKKzHgegBeHlaJwY72i/aDWdKVH5loOZ2t1Qp8/Y3y6O 6VNB6ObSHIZh2CZur0DkNBms+3s4XDnv5Nrn6kCad1+OtpcSf2b/C4dY8sm13Pnb/h vV/AdlPrgeXwQ== Date: Mon, 28 Sep 2020 18:42:30 +1000 From: Stephen Rothwell To: Manivannan Sadhasivam , David Miller , Networking Cc: Govind Singh , Kalle Valo , Loic Poulain , Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: build failure after merge of the mhi tree Message-ID: <20200928184230.2d973291@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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 --- 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, }, };