From patchwork Fri Sep 22 10:58:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 817432 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="sWpZZmuE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xz9Sz4ht3z9ryk for ; Fri, 22 Sep 2017 20:58:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbdIVK6m (ORCPT ); Fri, 22 Sep 2017 06:58:42 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35883 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751992AbdIVK6g (ORCPT ); Fri, 22 Sep 2017 06:58:36 -0400 Received: by mail-pf0-f193.google.com with SMTP id f84so320690pfj.3 for ; Fri, 22 Sep 2017 03:58:36 -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=5mMy4BCGfWjKJkTgV4LCny9g1+91+pdguFdMr7GUKVI=; b=sWpZZmuEvgub21RgXVpvrvKuTYseQCUbeDynTUscwkD26pLZpleOJfIUxTqXNHAB4r NKi8R2hdJXVk7Irihy4w6L5KtXa0Eny3BrZFS1GoxV4lUhAd/kN17s6XXBk+FdkqB48N f1hLIbHmy5Z0UyiG6pewaczKGGjj3RQ+h3cAwv677Q7YNFaxU+9lGlWDY1wuYVLWowy2 oC058rMBpWdXgKFPg+JEgmHeGvUN19XBolqoIL9hKiUzekzKrO/3hFusrIv9mWxiUnzo Nf3tJaTnMizm40Kki5TUV33lre55gMswF2SKM/mLDt/UphKAQiKTwvpM5mnHJSSSyPcl 15Uw== 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=5mMy4BCGfWjKJkTgV4LCny9g1+91+pdguFdMr7GUKVI=; b=YNVRTlzUOVHGOFPkJE2JcJlCoGfZuc7B8ZShd+w/jBEdiLSntkX63TFQR2K/ovxz4k PZ2QCrPHOyT30XReceXyStMfSSzOZ3wuFGw80dDU8fbURytoKP0gSW0lg6BPsq564gIo EpHIm6OpADfWwY3mtMmpqu2DjxfvKdnhYk82JsELX/kavJDI+8q/dpGQhKfSRFQrzpD/ gQkKGb9YZr77duoEvbz8Wmtr7u8Xw7pY9pq3YyEVhEbAfiKGxOTeiQWUMWE1TS4PqCI+ CZQMhHx+tSbiJ1cPPJrfBOtFl/TEzASXZ6NTVNlqKpLKEK18ozzuX3fnUqoEInv1GnFP j8bA== X-Gm-Message-State: AHPjjUgVhI0c5NcseOXaywuHRNSSraC10dWLmkvrSAb25kEzvs/S9VNZ PB3MVYNgSwFbZ1/fLtlizysOhGky X-Google-Smtp-Source: AOwi7QC1SRIkicnOu12JvxXfat1hWLOd5Gdj7C+nTalrKT2KNcX8AxfbMbZ8HL39u1UpJvCND+6MdA== X-Received: by 10.98.36.132 with SMTP id k4mr9034311pfk.148.1506077915297; Fri, 22 Sep 2017 03:58:35 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id s17sm6283035pgq.25.2017.09.22.03.58.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 03:58:34 -0700 (PDT) From: Allen Pais To: netdev@vger.kernel.org Cc: davem@davemloft.net, sameo@linux.intel.com, Allen Pais Subject: [PATCH 2/5] net: nfc: hci: llc_shdlc: use setup_timer() helper. Date: Fri, 22 Sep 2017 16:28:19 +0530 Message-Id: <1506077902-1796-3-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/hci/llc_shdlc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 17e59a0..58df37e 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -763,17 +763,14 @@ static void *llc_shdlc_init(struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv, mutex_init(&shdlc->state_mutex); shdlc->state = SHDLC_DISCONNECTED; - init_timer(&shdlc->connect_timer); - shdlc->connect_timer.data = (unsigned long)shdlc; - shdlc->connect_timer.function = llc_shdlc_connect_timeout; + setup_timer(&shdlc->connect_timer, llc_shdlc_connect_timeout, + (unsigned long)shdlc); - init_timer(&shdlc->t1_timer); - shdlc->t1_timer.data = (unsigned long)shdlc; - shdlc->t1_timer.function = llc_shdlc_t1_timeout; + setup_timer(&shdlc->t1_timer, llc_shdlc_t1_timeout, + (unsigned long)shdlc); - init_timer(&shdlc->t2_timer); - shdlc->t2_timer.data = (unsigned long)shdlc; - shdlc->t2_timer.function = llc_shdlc_t2_timeout; + setup_timer(&shdlc->t2_timer, llc_shdlc_t2_timeout, + (unsigned long)shdlc); shdlc->w = SHDLC_MAX_WINDOW; shdlc->srej_support = SHDLC_SREJ_SUPPORT;