From patchwork Fri Sep 22 10:58:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 817434 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pdrMPfu4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xz9T42jZJz9sP1 for ; Fri, 22 Sep 2017 20:58:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752097AbdIVK6r (ORCPT ); Fri, 22 Sep 2017 06:58:47 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33724 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbdIVK6o (ORCPT ); Fri, 22 Sep 2017 06:58:44 -0400 Received: by mail-pg0-f65.google.com with SMTP id i130so447865pgc.0 for ; Fri, 22 Sep 2017 03:58:44 -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=wPPFXFdth4AKZF0OkIbp9LPOTMR4IhxIp+LNKzOK3Nw=; b=pdrMPfu4GJmFIzLHi5MTQY4FCyIdEyY9p0Hu+Nuuxzka08EUCMb2pjbqae/PYMnmWB I0eiXehGQHwJY9zVmXJ7qWyxCVBEneoLiznRM51CNpHE4bJrSKTXRKczJ98dDR62JWtR AwoKKPf/vvZTtbxmzAMY9IWwqJPOKtWNso+a9ikMb9jreAvreWlyA+JObR7pyLHopt4c 7Acd/ah2ONBTvt5WPhHhgeqzgmneTFDpN18p4GS/u1oBIH2xgrTvGhL163pTO/DSYLj8 Gv8TFC8NQJ7Jyo326XIa5u8tj4waGhp0LO672WK5Vu9pMFDLQfh9aSYn4Mfc+carcREi sfoA== 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=wPPFXFdth4AKZF0OkIbp9LPOTMR4IhxIp+LNKzOK3Nw=; b=H5SqgE+3U0GKzPFeYbV6Y9MUH5DVm/EXq2/b6yQ/C8VunH16ILsjhd9nMoHE5bm+FD jIFwizQCtMI5ECdihJTpGz1o+5Akr2/IOEvNjIjGwiE6jy/c2FXC0s/uLCMp0BUBVcw+ IGRQUzJVwhe79A8qoUpYLeuzZm8g/NtmLSXvZgdizhOEZRASzqpiIa6jRyLFECEHRAZZ KDQf6OeVNDw2PCflMTI78JyWasw+Sr/fM3LScEbBLKCM4wbPOXGd9x8iQNyK6KiXN3/G CHD8Mzldai2cgZH+OsamWd9pJNckzHb9QK5K62LEJYuO+VDcvkZNh2zEm7FcoaYqjJJK y1EQ== X-Gm-Message-State: AHPjjUi8z006vLvXgAKlCUXZ5WyNQ4iOHHAgpCO+kEXg+IQkB0Cfhm3E mhFnV5fKYSb0yFCOacG2SLXB90KO X-Google-Smtp-Source: AOwi7QD4GCR6j4cR+pERy4MyGtC5+ztsa1jqlNYGC9M/ZKWJsFuT+lBqJt047iWydsOesj+rKje/+w== X-Received: by 10.98.20.19 with SMTP id 19mr8753264pfu.167.1506077924098; Fri, 22 Sep 2017 03:58:44 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id s17sm6283035pgq.25.2017.09.22.03.58.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 03:58:43 -0700 (PDT) From: Allen Pais To: netdev@vger.kernel.org Cc: davem@davemloft.net, sameo@linux.intel.com, Allen Pais Subject: [PATCH 5/5] net: nfc: llcp_core: use setup_timer() helper. Date: Fri, 22 Sep 2017 16:28:22 +0530 Message-Id: <1506077902-1796-6-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506077902-1796-1-git-send-email-allen.lkml@gmail.com> References: <1506077902-1796-1-git-send-email-allen.lkml@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais --- net/nfc/llcp_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 02eef5c..7988185 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -1573,9 +1573,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) INIT_LIST_HEAD(&local->list); kref_init(&local->ref); mutex_init(&local->sdp_lock); - init_timer(&local->link_timer); - local->link_timer.data = (unsigned long) local; - local->link_timer.function = nfc_llcp_symm_timer; + setup_timer(&local->link_timer, nfc_llcp_symm_timer, + (unsigned long)local); skb_queue_head_init(&local->tx_queue); INIT_WORK(&local->tx_work, nfc_llcp_tx_work); @@ -1601,9 +1600,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) mutex_init(&local->sdreq_lock); INIT_HLIST_HEAD(&local->pending_sdreqs); - init_timer(&local->sdreq_timer); - local->sdreq_timer.data = (unsigned long) local; - local->sdreq_timer.function = nfc_llcp_sdreq_timer; + setup_timer(&local->sdreq_timer, nfc_llcp_sdreq_timer, + (unsigned long)local); INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work); list_add(&local->list, &llcp_devices);