Message ID | 1506013525-29291-31-git-send-email-allen.lkml@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uulaHNGv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyjkh6L6kz9t5Y for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:09:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752581AbdIURI5 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:08:57 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36596 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbdIURIw (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:08:52 -0400 Received: by mail-pg0-f66.google.com with SMTP id d8so3744937pgt.3; Thu, 21 Sep 2017 10:08:52 -0700 (PDT) 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; bh=eGJspAAcaUwQQCLF5feVFepxUrFKVKqblRAbeI04CRw=; b=uulaHNGva6zsJz2bth2LViNQ5KfVHJPdVmoEnlz309S53bsQY/40TniHG1u/PpCTzY snBFGfCVqhn0AH//Pl/lxdvjGyvD4MZah+8M68hYCLIIo/CrQDBcwWD0a40bBb90zYoI eRI67+f8T8Azxl9OXEJ6zsQsmcT7QyPqrheWlX8qxA7xuvnS9HZ/o5m3l8Jd4LZVeWsP 4epNrfZsQOKUwCXzK4W/Zi+3J/ht8oUjpK1RgqWALJzs8inSjuhCN9eEbokLupVJ17vu P847U6llSSeqFC0NULVqrmDPQ5Nsy4K0g7t9OKxmF4Xrd6FdYfwJa/Fh4BI4tP1Vl8Gs x/ag== 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; bh=eGJspAAcaUwQQCLF5feVFepxUrFKVKqblRAbeI04CRw=; b=amaMGlym/eqUOk53t3q2sGFuRLicuHMfZTiVZef3XjAQswqj+m1g0yranSB7LF7Tz6 hVYvIEhtKiwlcJWAg62F89aG3roO2hf85bTNT6b9c7wCNmzA/vwObPY5PLTrUbIsl5ya PRNvz1pRSifDKnCZKttv6oKsQKG1oNmlQKMyp57GEzhqW1/q8FJd/RV+xke07rlln7Oe +2VK+csWBD4JDZ3fvGITNnLWRpAywVWPl/pv9SITwGWR9K4v6rhWGIUeiXFR7rdUZHc8 FLjQjq6/q5oFzba2g6TVDiET9v0Ig5ck6sAZQ2ulksTvPpQS1VnxREIT6IjVoT/N73aX 2Aog== X-Gm-Message-State: AHPjjUhRi+NNuM5qi40206JCCfvJy5hRl7WSPdInrh95O2z6S4CPiKs5 HFUQZd11mf90wYN0T37ySqasfY8R X-Google-Smtp-Source: AOwi7QBQzVHQIkK6UR9++jI6KVUwUFX++TSLf7jEEj3lzKgvoi8DHwbQi5S1TY+achKJwOio984IvA== X-Received: by 10.84.245.149 with SMTP id j21mr6155288pll.105.1506013731784; Thu, 21 Sep 2017 10:08:51 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.08.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:08:50 -0700 (PDT) From: Allen Pais <allen.lkml@gmail.com> To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, m.grzeschik@pengutronix.de, dmitry.tarnyagin@lockless.no, wg@grandegger.com, mkl@pengutronix.de, mark.einon@gmail.com, linux@armlinux.org.uk, pcnet32@frontier.com, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, venza@brownhat.org, ajk@comnets.uni-bremen.de, jes@trained-monkey.org, romieu@fr.zoreil.com, khc@pm.waw.pl, simon@thekelleys.org.uk, davem@davemloft.net, linux-can@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, Allen Pais <allen.lkml@gmail.com> Subject: [PATCH 30/64] drivers: net: qlogic: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:51 +0530 Message-Id: <1506013525-29291-31-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506013525-29291-1-git-send-email-allen.lkml@gmail.com> References: <1506013525-29291-1-git-send-email-allen.lkml@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
use setup_timer() helper function.
|
expand
|
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 2991179..05479d4 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -3891,10 +3891,8 @@ static int ql3xxx_probe(struct pci_dev *pdev, INIT_DELAYED_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work); INIT_DELAYED_WORK(&qdev->link_state_work, ql_link_state_machine_work); - init_timer(&qdev->adapter_timer); - qdev->adapter_timer.function = ql3xxx_timer; + setup_timer(&qdev->adapter_timer, ql3xxx_timer, (unsigned long)qdev); qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */ - qdev->adapter_timer.data = (unsigned long)qdev; if (!cards_found) { pr_alert("%s\n", DRV_STRING);
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> --- drivers/net/ethernet/qlogic/qla3xxx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)