From patchwork Thu Sep 8 12:16:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 9321241 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E05DC60869 for ; Thu, 8 Sep 2016 12:16:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CECDE29804 for ; Thu, 8 Sep 2016 12:16:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3445297C5; Thu, 8 Sep 2016 12:16:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF4CC297C5 for ; Thu, 8 Sep 2016 12:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756503AbcIHMQa (ORCPT ); Thu, 8 Sep 2016 08:16:30 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:60639 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753874AbcIHMQ3 (ORCPT ); Thu, 8 Sep 2016 08:16:29 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3A16361BC6; Thu, 8 Sep 2016 12:16:28 +0000 (UTC) Received: from potku.adurom.net (a88-115-185-251.elisa-laajakaista.fi [88.115.185.251]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A0E4561AE0; Thu, 8 Sep 2016 12:16:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org A0E4561AE0 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: Bjorn Andersson Cc: Eugene Krasnikov , wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross Subject: Re: [PATCH v4 2/4] wcn36xx: Transition driver to SMD client References: <1473200312-22438-1-git-send-email-bjorn.andersson@linaro.org> <1473200312-22438-2-git-send-email-bjorn.andersson@linaro.org> Date: Thu, 08 Sep 2016 15:16:21 +0300 In-Reply-To: <1473200312-22438-2-git-send-email-bjorn.andersson@linaro.org> (Bjorn Andersson's message of "Tue, 6 Sep 2016 15:18:30 -0700") Message-ID: <87k2emsi22.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bjorn Andersson writes: > The wcn36xx wifi driver follows the life cycle of the WLAN_CTRL SMD > channel, as such it should be a SMD client. This patch makes this > transition, now that we have the necessary frameworks available. > > Signed-off-by: Bjorn Andersson > --- > > Changes since v3: > - Made msg_header const in wcn36xx_smd_rsp_process() > > Changes since v2: > - Correct the call to the new ieee80211_scan_completed() > > drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +++--- > drivers/net/wireless/ath/wcn36xx/main.c | 79 ++++++++++++++++++++---------- > drivers/net/wireless/ath/wcn36xx/smd.c | 31 +++++------- > drivers/net/wireless/ath/wcn36xx/smd.h | 5 ++ > drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 21 +++----- > 5 files changed, 86 insertions(+), 66 deletions(-) This doesn't compile for me: CC [M] drivers/net/wireless/ath/wcn36xx/main.o CC [M] drivers/net/wireless/ath/wcn36xx/dxe.o CC [M] drivers/net/wireless/ath/wcn36xx/txrx.o CC [M] drivers/net/wireless/ath/wcn36xx/smd.o CC [M] drivers/net/wireless/ath/wcn36xx/pmc.o CC [M] drivers/net/wireless/ath/wcn36xx/debug.o LD [M] drivers/net/wireless/ath/wcn36xx/wcn36xx.o drivers/net/wireless/ath/wcn36xx/smd.o: In function `qcom_smd_get_drvdata': /home/kvalo/ath10k/src/ath/./include/linux/soc/qcom/smd.h:87: multiple definition of `qcom_smd_get_drvdata' drivers/net/wireless/ath/wcn36xx/main.o:/home/kvalo/ath10k/src/ath/./include/linux/soc/qcom/smd.h:87: first defined here drivers/net/wireless/ath/wcn36xx/smd.o: In function `qcom_smd_set_drvdata': /home/kvalo/ath10k/src/ath/./include/linux/soc/qcom/smd.h:94: multiple definition of `qcom_smd_set_drvdata' drivers/net/wireless/ath/wcn36xx/main.o:/home/kvalo/ath10k/src/ath/./include/linux/soc/qcom/smd.h:94: first defined here make[5]: *** [drivers/net/wireless/ath/wcn36xx/wcn36xx.o] Error 1 I fixed it with the diff below. Please let me know if it looks ok to you, the patch is not applied yet so it's easy to make changes. The full commit in my pending branch: https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=dba68ea7a404a9959d0ab44bc13c844187db6d6a --- a/include/linux/soc/qcom/smd.h +++ b/include/linux/soc/qcom/smd.h @@ -83,14 +83,14 @@ qcom_smd_open_channel(struct qcom_smd_channel *channel, return NULL; } -void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel) +static inline void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel) { /* This shouldn't be possible */ WARN_ON(1); return NULL; } -void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data) +static inline void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data) { /* This shouldn't be possible */ WARN_ON(1);