From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AA6DC2D0C6 for ; Wed, 11 Dec 2019 18:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43EFD2077B for ; Wed, 11 Dec 2019 18:15:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pQOBOLyJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731316AbfLKSPi (ORCPT ); Wed, 11 Dec 2019 13:15:38 -0500 Received: from mail-yb1-f193.google.com ([209.85.219.193]:40844 "EHLO mail-yb1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731281AbfLKSPf (ORCPT ); Wed, 11 Dec 2019 13:15:35 -0500 Received: by mail-yb1-f193.google.com with SMTP id n196so668575ybg.7; Wed, 11 Dec 2019 10:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QVBn4iyxCFtZQ6l2ifso8EO7BmmbJ8gqwzlkKDMZ+b0=; b=pQOBOLyJAOXdkAByxSpa45JZ8gIhUVoN88CzHwopEOntTivioJ271CvnarkR4INXqv ZDsSAVKlcB4fJIeJ5m1XLFDjI928mGOk9GCUEEI6FFNf+lOfu6fBfKb+Q9RvyjKlpUEI 4ILsI66IDvBv8a8lcEjde5LzqkczsoI7AVDbCzaljPAUuWaDjAnVDmP5iEnmWrAH4EeI 8t/Zi52AvcxBdLRuCsAeP/B5mLfjJv4Y4BWa2Asn2M1qx7dLalVQYpFaF5pJdgOM7Pn2 0S2d6/1sYWYyNDxUZn4WG9+riUJ7tgpsNzOVFgnkJIC5nbnHhaRs9iFkdS/DZ+G/4+XC ez8g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QVBn4iyxCFtZQ6l2ifso8EO7BmmbJ8gqwzlkKDMZ+b0=; b=kVSRHiVZEWtN8EGQb/o45nq75Q/oom0cdPYOUR3gj9tmdFahwNe0jFhL9Fl1LDcTbB EdZTqvJvvSgAoZNIe1L9R6bUWDZok4jre43PumhqVRJA/TYfzdLp1ICEOcLC7IbESVDl lRXb3fKZDSXoan80zRtB5rsvxrXurGASF2xi6MD5220x2BaOSr/iEuqQdXa4VU3PlOur N6nh6FPY7p1pkZg8F57FSc6qIHixd4SLlYx88FqRENJ2ExaQcIRJZF5oEXDbSZ07BlSr 6NGzzaLwjDmkSQRsVRLgTVNsA8HLqCryAD+YGapjwxNSZlOibKdV0TmOkYFqU9Z4h5gN DHXw== X-Gm-Message-State: APjAAAVpEY52xw5MdCDK6BvbX+IA0/tSLKK0sP0bx/O4gk7HnrjgIq4k bqeEf+wdhmKYg5i1lWruHy/kx4cftuyuRQ== X-Google-Smtp-Source: APXvYqzkgGwAWatyCrigitcbfKFcDI/TWYvwjodqhO70wwtdpa4DhxupOzAq7gSDAsprih7nCdhQAA== X-Received: by 2002:a25:dd5:: with SMTP id 204mr999122ybn.452.1576088133641; Wed, 11 Dec 2019 10:15:33 -0800 (PST) Received: from karen ([2604:2d80:d68a:cf00:a4bc:8e08:1748:387f]) by smtp.gmail.com with ESMTPSA id d13sm1278930ywj.91.2019.12.11.10.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:15:33 -0800 (PST) From: Scott Schafer To: gregkh@linuxfoundation.org Cc: Scott Schafer , Manish Chopra , GR-Linux-NIC-Dev@marvell.com, netdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 19/23] staging: qlge: Fix WARNING: msleep < 20ms can sleep for up to 20ms Date: Wed, 11 Dec 2019 12:12:48 -0600 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix WARNING: msleep < 20ms can sleep for up to 20ms by changing msleep to usleep_range() in qlge_dbg.c, qlge_ethtool.c, and qlge_main.c Signed-off-by: Scott Schafer --- drivers/staging/qlge/qlge_dbg.c | 2 +- drivers/staging/qlge/qlge_ethtool.c | 2 +- drivers/staging/qlge/qlge_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c index 0f1e1b62662d..ba801de02109 100644 --- a/drivers/staging/qlge/qlge_dbg.c +++ b/drivers/staging/qlge/qlge_dbg.c @@ -1340,7 +1340,7 @@ void ql_mpi_core_to_log(struct work_struct *work) tmp[i + 5], tmp[i + 6], tmp[i + 7]); - msleep(5); + usleep_range(5000, 6000); } } diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c index b9e1e154d646..abed932c3694 100644 --- a/drivers/staging/qlge/qlge_ethtool.c +++ b/drivers/staging/qlge/qlge_ethtool.c @@ -555,7 +555,7 @@ static int ql_run_loopback_test(struct ql_adapter *qdev) atomic_inc(&qdev->lb_count); } /* Give queue time to settle before testing results. */ - msleep(2); + usleep_range(2000, 3000); ql_clean_lb_rx_ring(&qdev->rx_ring[0], 128); return atomic_read(&qdev->lb_count) ? -EIO : 0; } diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c index c6e26a757268..e18aa335c899 100644 --- a/drivers/staging/qlge/qlge_main.c +++ b/drivers/staging/qlge/qlge_main.c @@ -3924,7 +3924,7 @@ static int qlge_close(struct net_device *ndev) * (Rarely happens, but possible.) */ while (!test_bit(QL_ADAPTER_UP, &qdev->flags)) - msleep(1); + usleep_range(1000, 2000); /* Make sure refill_work doesn't re-enable napi */ for (i = 0; i < qdev->rss_ring_count; i++) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FD85C00454 for ; Wed, 11 Dec 2019 18:16:12 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 38C7F206C3 for ; Wed, 11 Dec 2019 18:16:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pQOBOLyJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38C7F206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0B0F923358; Wed, 11 Dec 2019 18:16:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X1Ui0mvkuJFh; Wed, 11 Dec 2019 18:16:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 723CF2302C; Wed, 11 Dec 2019 18:16:10 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 221AE1BF473 for ; Wed, 11 Dec 2019 18:15:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EF67287F30 for ; Wed, 11 Dec 2019 18:15:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5dx69a1narlC for ; Wed, 11 Dec 2019 18:15:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8C12C87F35 for ; Wed, 11 Dec 2019 18:15:34 +0000 (UTC) Received: by mail-yb1-f195.google.com with SMTP id k17so9405335ybp.1 for ; Wed, 11 Dec 2019 10:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QVBn4iyxCFtZQ6l2ifso8EO7BmmbJ8gqwzlkKDMZ+b0=; b=pQOBOLyJAOXdkAByxSpa45JZ8gIhUVoN88CzHwopEOntTivioJ271CvnarkR4INXqv ZDsSAVKlcB4fJIeJ5m1XLFDjI928mGOk9GCUEEI6FFNf+lOfu6fBfKb+Q9RvyjKlpUEI 4ILsI66IDvBv8a8lcEjde5LzqkczsoI7AVDbCzaljPAUuWaDjAnVDmP5iEnmWrAH4EeI 8t/Zi52AvcxBdLRuCsAeP/B5mLfjJv4Y4BWa2Asn2M1qx7dLalVQYpFaF5pJdgOM7Pn2 0S2d6/1sYWYyNDxUZn4WG9+riUJ7tgpsNzOVFgnkJIC5nbnHhaRs9iFkdS/DZ+G/4+XC ez8g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QVBn4iyxCFtZQ6l2ifso8EO7BmmbJ8gqwzlkKDMZ+b0=; b=Hlsvf3lTr2BuEnWZjWVZk+Ppj9b5p/ngpRLBArhuL2GDHzl8/Cv9bZvqiz7cDH+pZV xTKTWX84pQYgz8nSOlVgsDEfacud82B5FBsD8eGyIek4WayEsBVOQ3ijv7ziPnTwFkMx +wPGoNFdhrJUUYto8cl43yQYWKmR0tm2D0kp9Z7cLvbGjH31A/udyaBpTP5nSP/AQVYh TEBckUkN0QfPjlADcYAsuLdmGE3/adi3tHKQsnlTYcez/QLDi76a0fSJ6yjCfSeH8+rd ATAaBjap/rMXQ5djpr3nRanlafm6y3gxc2exidhkLvh9OM3fn90dJIF8Wa7sNnJL5iNg vRHA== X-Gm-Message-State: APjAAAUmxtUUFdUHWRil2iR+MlKrAhjywbll5hPm3HkWVwQRpkhc4f1E rP8BrLAejIo0729Dg2VXREY= X-Google-Smtp-Source: APXvYqzkgGwAWatyCrigitcbfKFcDI/TWYvwjodqhO70wwtdpa4DhxupOzAq7gSDAsprih7nCdhQAA== X-Received: by 2002:a25:dd5:: with SMTP id 204mr999122ybn.452.1576088133641; Wed, 11 Dec 2019 10:15:33 -0800 (PST) Received: from karen ([2604:2d80:d68a:cf00:a4bc:8e08:1748:387f]) by smtp.gmail.com with ESMTPSA id d13sm1278930ywj.91.2019.12.11.10.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:15:33 -0800 (PST) From: Scott Schafer To: gregkh@linuxfoundation.org Subject: [PATCH v2 19/23] staging: qlge: Fix WARNING: msleep < 20ms can sleep for up to 20ms Date: Wed, 11 Dec 2019 12:12:48 -0600 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, GR-Linux-NIC-Dev@marvell.com, Manish Chopra , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Scott Schafer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" Fix WARNING: msleep < 20ms can sleep for up to 20ms by changing msleep to usleep_range() in qlge_dbg.c, qlge_ethtool.c, and qlge_main.c Signed-off-by: Scott Schafer --- drivers/staging/qlge/qlge_dbg.c | 2 +- drivers/staging/qlge/qlge_ethtool.c | 2 +- drivers/staging/qlge/qlge_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c index 0f1e1b62662d..ba801de02109 100644 --- a/drivers/staging/qlge/qlge_dbg.c +++ b/drivers/staging/qlge/qlge_dbg.c @@ -1340,7 +1340,7 @@ void ql_mpi_core_to_log(struct work_struct *work) tmp[i + 5], tmp[i + 6], tmp[i + 7]); - msleep(5); + usleep_range(5000, 6000); } } diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c index b9e1e154d646..abed932c3694 100644 --- a/drivers/staging/qlge/qlge_ethtool.c +++ b/drivers/staging/qlge/qlge_ethtool.c @@ -555,7 +555,7 @@ static int ql_run_loopback_test(struct ql_adapter *qdev) atomic_inc(&qdev->lb_count); } /* Give queue time to settle before testing results. */ - msleep(2); + usleep_range(2000, 3000); ql_clean_lb_rx_ring(&qdev->rx_ring[0], 128); return atomic_read(&qdev->lb_count) ? -EIO : 0; } diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c index c6e26a757268..e18aa335c899 100644 --- a/drivers/staging/qlge/qlge_main.c +++ b/drivers/staging/qlge/qlge_main.c @@ -3924,7 +3924,7 @@ static int qlge_close(struct net_device *ndev) * (Rarely happens, but possible.) */ while (!test_bit(QL_ADAPTER_UP, &qdev->flags)) - msleep(1); + usleep_range(1000, 2000); /* Make sure refill_work doesn't re-enable napi */ for (i = 0; i < qdev->rss_ring_count; i++) -- 2.20.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel