From patchwork Thu Jan 22 15:27:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: clement.perrochaud@effinnov.com X-Patchwork-Id: 5686791 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D54C69F357 for ; Thu, 22 Jan 2015 16:58:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE65C20256 for ; Thu, 22 Jan 2015 16:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D003B200DC for ; Thu, 22 Jan 2015 16:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753779AbbAVQ6L (ORCPT ); Thu, 22 Jan 2015 11:58:11 -0500 Received: from 6.mo1.mail-out.ovh.net ([46.105.43.205]:42035 "EHLO 6.mo1.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752061AbbAVQ54 (ORCPT ); Thu, 22 Jan 2015 11:57:56 -0500 X-Greylist: delayed 3001 seconds by postgrey-1.27 at vger.kernel.org; Thu, 22 Jan 2015 11:57:56 EST Received: from mail434.ha.ovh.net (gw6.ovh.net [213.251.189.206]) by mo1.mail-out.ovh.net (Postfix) with SMTP id 1DF44FFA0B2 for ; Thu, 22 Jan 2015 16:42:34 +0100 (CET) Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 22 Jan 2015 17:42:34 +0200 Received: from 176-171-190-109.dsl.ovh.fr (HELO PC-Clement.localdomain) (clement.perrochaud@effinnov.com@109.190.171.176) by ns0.ovh.net with SMTP; 22 Jan 2015 17:42:33 +0200 From: clement.perrochaud@effinnov.com To: linux-nfc@lists.01.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Perrochaud?= , sunil.jogi@nxp.com, jerome.pele@nxp.com, Charles.Gorand-Effinnov@nxp.com, lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, davem@davemloft.net, grant.likely@linaro.org, lefrique@marvell.com, christophe.ricard@gmail.com, cuissard@marvell.com, bzhao@marvell.com, hirent@marvell.com, akarwar@marvell.com, linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, =?UTF-8?q?Cl=C3=A9ment=20Perrochaud?= Subject: [PATCH 4/4] NFC: nxp-nci: Allow module removal during download Date: Thu, 22 Jan 2015 16:27:40 +0100 Message-Id: <1421940460-14049-5-git-send-email-clement.perrochaud@effinnov.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1421940460-14049-1-git-send-email-clement.perrochaud@effinnov.com> References: <1421940460-14049-1-git-send-email-clement.perrochaud@effinnov.com> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1854357146893871917 X-Ovh-Remote: 109.190.171.176 (176-171-190-109.dsl.ovh.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeejkedrtdekucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeejkedrtdekucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Clément Perrochaud Signed-off-by: Clément Perrochaud Signed-off-by: Clément Perrochaud --- drivers/nfc/nxp-nci/core.c | 7 +++---- drivers/nfc/nxp-nci/firmware.c | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c index d3643ef..c15606d 100644 --- a/drivers/nfc/nxp-nci/core.c +++ b/drivers/nfc/nxp-nci/core.c @@ -165,12 +165,11 @@ void nxp_nci_remove(struct nci_dev *ndev) { struct nxp_nci_info *info = nci_get_drvdata(ndev); - mutex_lock(&info->info_lock); - - cancel_work_sync(&info->fw_info.work); - if (info->mode == NXP_NCI_MODE_FW) nxp_nci_fw_work_complete(info, -ESHUTDOWN); + cancel_work_sync(&info->fw_info.work); + + mutex_lock(&info->info_lock); if (info->phy_ops->disable) info->phy_ops->disable(info->phy_id); diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c index 1814e9f..de136e1 100644 --- a/drivers/nfc/nxp-nci/firmware.c +++ b/drivers/nfc/nxp-nci/firmware.c @@ -166,7 +166,8 @@ static int nxp_nci_fw_send(struct nxp_nci_info *info) if (*fw_info->data == NXP_NCI_FW_CMD_RESET) { fw_info->cmd_result = 0; - schedule_work(&fw_info->work); + if (fw_info->fw) + schedule_work(&fw_info->work); } else { completion_rc = wait_for_completion_interruptible_timeout( &fw_info->cmd_completion, NXP_NCI_FW_ANSWER_TIMEOUT); @@ -244,7 +245,8 @@ int nxp_nci_fw_download(struct nci_dev *ndev, const char *firmware_name) fw_info->frame_size = 0; fw_info->cmd_result = 0; - schedule_work(&fw_info->work); + if (fw_info->fw) + schedule_work(&fw_info->work); fw_download_exit: mutex_unlock(&info->info_lock); @@ -316,6 +318,7 @@ void nxp_nci_fw_recv_frame(struct nci_dev *ndev, struct sk_buff *skb) fw_info->cmd_result = -EIO; } - schedule_work(&fw_info->work); + if (fw_info->fw) + schedule_work(&fw_info->work); } EXPORT_SYMBOL(nxp_nci_fw_recv_frame);