From patchwork Wed Dec 23 08:50:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1419947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D16sJ38dNz9sTg; Wed, 23 Dec 2020 20:11:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ks0BK-00018g-7g; Wed, 23 Dec 2020 09:11:42 +0000 Received: from mail-pg1-f176.google.com ([209.85.215.176]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ks04B-0003V2-6c for kernel-team@lists.ubuntu.com; Wed, 23 Dec 2020 09:04:19 +0000 Received: by mail-pg1-f176.google.com with SMTP id f17so10214348pge.6 for ; Wed, 23 Dec 2020 01:04:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+TbWD6Ku7+1iQMmrZpdF49iV0J0B7WwcBFbjAu6YGvs=; b=PpRp4DgZcFSWzzcE/5PWaZx7lT3UJJa+wP8MsGdiE8RkOmRlpNwZr4OA2fPxKlmr7Y m+YT7WIGxFDvdPfsqVHmsK2DbJOx2cik6vZMstT/r/TMjrigKzgk/HA0D6ksZChMP5fg BU4jw18HF+I6V83RBdT39dHNZSiLhNIq/7/VvAXeVBlhUbqoX9txr3jbilmYB8sl7QHv DbOK43J+dx7SCALm+2sMvV+74SGpa3LfGaVARt+k+k8RKk1Coa7NbsYfWzfSMuFRc6cM Kco5/phq+36RZLN2NX2beIF7VfRivnj5tj8ryQnz6/n1+EkGlb9t/32l0MrIay8mHDQO 9uYQ== X-Gm-Message-State: AOAM530EZPDGgTbJS4tkBRMHEe2f4BKgFD7eajj3Jh+N2NKEZ8m6ZEw+ icpQmkJV37Y4u3h6alBahk0Ssu9Ubtd+TIdZ X-Google-Smtp-Source: ABdhPJyUUtICKRBfPqd2/5yfTDIv1HxNW1ngRfS4IGC/bYLq4EI15BJBC+/dPvtxalAf5wcj+j0F3w== X-Received: by 2002:a62:384b:0:b029:19d:a5c6:d76 with SMTP id f72-20020a62384b0000b029019da5c60d76mr22930299pfa.16.1608714240474; Wed, 23 Dec 2020 01:04:00 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id s7sm22535069pfh.207.2020.12.23.01.03.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 01:03:59 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 277/379][SRU][OEM-5.6] ath11k: fix link error when CONFIG_REMOTEPROC is disabled Date: Wed, 23 Dec 2020 16:50:10 +0800 Message-Id: <20201223085152.554896-278-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223085152.554896-1-vicamo.yang@canonical.com> References: <20201223085152.554896-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.176; envelope-from=vicamo@gmail.com; helo=mail-pg1-f176.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kalle Valo BugLink: https://bugs.launchpad.net/bugs/1879633 If CONFIG_REMOTEPROC was disabled the linking failed with: ERROR: modpost: "rproc_get_by_phandle" [drivers/net/wireless/ath/ath11k/ath11k.ko] undefined! Compile tested only. Reported-by: Randy Dunlap Fixes: 1ff8ed786d5d ("ath11k: use remoteproc only with AHB devices") Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/0101017476e38f40-c4168ac4-c00a-4220-a032-fe17e4a157cb-000000@us-west-2.amazonses.com (cherry picked from commit 5c0ec012ca7f7771f4a2dc9e41333411dd2693bc) Signed-off-by: You-Sheng Yang --- drivers/net/wireless/ath/ath11k/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 06c3df6037d5..ce81702b27d2 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -848,6 +848,9 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab) struct rproc *prproc; phandle rproc_phandle; + if (!IS_ENABLED(CONFIG_REMOTEPROC)) + return 0; + if (ab->bus_params.mhi_support) return 0;