From patchwork Mon May 1 19:36:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9706851 X-Patchwork-Delegate: kvalo@adurom.com 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 E354760385 for ; Mon, 1 May 2017 19:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D257D209CD for ; Mon, 1 May 2017 19:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C704C280FC; Mon, 1 May 2017 19:37:20 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM 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 C4D17209CD for ; Mon, 1 May 2017 19:37:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751749AbdEAThJ (ORCPT ); Mon, 1 May 2017 15:37:09 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:33224 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbdEAThE (ORCPT ); Mon, 1 May 2017 15:37:04 -0400 Received: by mail-pg0-f54.google.com with SMTP id y4so43831628pge.0 for ; Mon, 01 May 2017 12:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=rjo7kFLadWMxzGxlyUlMsvDc1VnyE75cnvRLiD70Qa8=; b=W+TPBKJwQ0RHvjN/j1+ICsjSd9Zb5h+nXLVzsV67XJjZ3z5S9khvvPYgj9uZMnnU0M 6vMOgGgZk4g/WiSVjT8NCJ+lcdw6g8ZNMDZqsc421sKsjUhFhwkDjbpYZTmFQX3bJa58 CMddy1wIq10mNwwHjNsEAJG+1lq2OSfi9Zw4Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rjo7kFLadWMxzGxlyUlMsvDc1VnyE75cnvRLiD70Qa8=; b=DL7ys98ydmZL4Oz6bRxj3x12xN6HsvOFVrGi5W1CKFmXCtc7Hk7+eTWKYQ5YGUj7BI PViltmnBcO9g4PGK7IYYpkS4+4JdCf4m4s8IaU2nSPhDc3Y9tG3qFfY5gM5QrAp+Uqlm M/6ZOnxaJ0KBDGE5/oI5/m4bk7lzZScma9fHpTwbgjk28su2OB/zfeOx4ypH6aIW3MpE DkUk9/nt/12XltLf/quBKcF+C+Zn6XBwNwpepZJ+4cw+Gujz/rg92YHak+uAY26iCFZE y7XIBS8eFz9TWPQuTyZ8ZFqtwENClVqUVi2VGLlNmCfLz9IEpTEqV4IbB8o2bKkwD3Qq ONig== X-Gm-Message-State: AN3rC/6AkjHbD/GNggMDxqYuPf0F0WpAZXFJLaMpjIK1xsKfGX/w4HvI DPxDYFwAhuYvZJvN X-Received: by 10.98.100.87 with SMTP id y84mr4868433pfb.139.1493667423301; Mon, 01 May 2017 12:37:03 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id n85sm32642715pfi.101.2017.05.01.12.37.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 May 2017 12:37:02 -0700 (PDT) From: Brian Norris To: Ganapathi Bhat , Nishant Sarmukadam Cc: , Dmitry Torokhov , Kalle Valo , linux-wireless@vger.kernel.org, Brian Norris Subject: [PATCH v3 1/2] mwifiex: initiate card-specific work atomically Date: Mon, 1 May 2017 12:36:59 -0700 Message-Id: <20170501193700.89264-1-briannorris@chromium.org> X-Mailer: git-send-email 2.13.0.rc0.306.g87b477812d-goog Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The non-atomic test + set is a little awkward here, and it technically means we might double-schedule work unnecessarily. AFAICT, this is not really a problem, since the extra "work" will be a no-op (the flag(s) will be cleared by then), but it's still an anti-pattern. Rewrite this to use the atomic test_and_set_bit() helper instead. Signed-off-by: Brian Norris Reviewed-by: Dmitry Torokhov --- v3: fix bisectability (unused code warning) -- some code from patch 2 crept in here v2: new --- drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++------ drivers/net/wireless/marvell/mwifiex/sdio.c | 16 +++++----------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index ac62bce50e96..5f56e8e6d612 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -2837,12 +2837,9 @@ static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter) { struct pcie_service_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); - - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, + &card->work_flags)) + schedule_work(&card->work); } static void mwifiex_pcie_free_buffers(struct mwifiex_adapter *adapter) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index 0af1c6733c92..d38d31bb9b79 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -2533,12 +2533,8 @@ static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter) { struct sdio_mmc_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags); - - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) + schedule_work(&card->work); } /* This function dumps FW information */ @@ -2546,11 +2542,9 @@ static void mwifiex_sdio_device_dump(struct mwifiex_adapter *adapter) { struct sdio_mmc_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, + &card->work_flags)) + schedule_work(&card->work); } /* Function to dump SDIO function registers and SDIO scratch registers in case