From patchwork Sat Jan 19 21:03:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1028060 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rJmGg0SR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hr4S43fKz9s7h for ; Sun, 20 Jan 2019 08:07:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729450AbfASVHv (ORCPT ); Sat, 19 Jan 2019 16:07:51 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45114 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfASVHt (ORCPT ); Sat, 19 Jan 2019 16:07:49 -0500 Received: by mail-wr1-f66.google.com with SMTP id t6so18999783wrr.12 for ; Sat, 19 Jan 2019 13:07:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ai84mafndYz3N7gA7ZSEkiAgXjocjekk+ncX9tULANE=; b=rJmGg0SRH47edjLf/qPwz+pwFlPZDPrzBizZbCywtCoFJOOU4Ln9NBZg88XMpRFcq0 hYlSywUFd6zVaaIlcAJrQlqUQosKWVlh09Fl8RBZcktEfTwBHDjfYDgApZpFypIvSlMb 0Fa0eOBB8QtgcckMoKYLxEDsrqgdLACVQReqitlpE8Euw0apMixEYePc1cfmytusCN6x LiOzPDYa/slRiXWwiDsIdCPpsM2P5fEC9a6K+up+YvQi9yQ4wmZGf4yGc9wVBtL2mRyL 706J0WeMk+ULPcJRALmM72vMTHQ0G0025NFBMUxL3GvbtMNcKhBoNMklwzROM5hT9A7m Ek5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ai84mafndYz3N7gA7ZSEkiAgXjocjekk+ncX9tULANE=; b=f/D8dxa9VH4tx4XL3RBICSsUExi6ki+23Wk3m7l/5Fk3klsMINHo+WWJT+IRWDwD6m ifbNvLm7wKorF/3toOrPefkagM2IKRFUcmXbGtFx4o6yKLf+UajXMd39HYbcWe/B0WIj 7DYMcMi38HC2oxmyZR4kkAD6ga+33ZarELWGirTtjzSNW7DHydJ5gyqFp2PqfcDzuUsf N6GOxsYXgxQn7KIwKS5INHsOTm+LN4nXjiGlnUYgTcOrtozvtGIEuBuk9fBsh9xsj3wI dSFwtfrQtb3hAsZMNJDZEEZD3Cry/qLc+pSLKNteY82NfM2pvt49qQxbDzBEbd5nzD3T 2x4w== X-Gm-Message-State: AJcUukdxJrmTyiHRBajodSW64akwohGmR7tzL2DWi8A0Ak0GSpMz3I8X ZC/QHizkFqB4QPT74Si3HcyRdgA8 X-Google-Smtp-Source: ALg8bN4zBHuTalcnl6z+5nBFf3Rpx+aTYVutaHyWwPRnXgnt+ACTBo5yc0VtvUhlvik3hsaM9jNY6A== X-Received: by 2002:adf:fe8f:: with SMTP id l15mr6653319wrr.313.1547932067632; Sat, 19 Jan 2019 13:07:47 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id n127sm51824880wmd.20.2019.01.19.13.07.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 13:07:47 -0800 (PST) Subject: [PATCH net-next v2 3/8] r8169: initialize task workqueue only once From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: Message-ID: <51e77c84-2ddc-d883-89ee-2826fdccb533@gmail.com> Date: Sat, 19 Jan 2019 22:03:49 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's sufficient to initialize the workqueue once, therefore remove the additional initialization whenever rtl_open() is called. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index fd3c6a548..c4d53bc6a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6630,10 +6630,6 @@ static int rtl_open(struct net_device *dev) if (retval < 0) goto err_free_rx_1; - INIT_WORK(&tp->wk.work, rtl_task); - - smp_mb(); - rtl_request_firmware(tp); retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, tp, @@ -7293,6 +7289,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->saved_wolopts = __rtl8169_get_wol(tp); mutex_init(&tp->wk.mutex); + INIT_WORK(&tp->wk.work, rtl_task); u64_stats_init(&tp->rx_stats.syncp); u64_stats_init(&tp->tx_stats.syncp);