From patchwork Fri May 12 07:35:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie Qirong X-Patchwork-Id: 761470 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wPMGn1MF4z9ryk for ; Fri, 12 May 2017 17:36:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i2DcQ7KS"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757441AbdELHgH (ORCPT ); Fri, 12 May 2017 03:36:07 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36757 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755723AbdELHgF (ORCPT ); Fri, 12 May 2017 03:36:05 -0400 Received: by mail-pg0-f66.google.com with SMTP id h64so1901539pge.3; Fri, 12 May 2017 00:36:05 -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; bh=lOLK5+RzyBRplnlwJ9MbxBBdfQY5yrHSwnQ5CraT9BM=; b=i2DcQ7KSwy1fUw1JT5WFLyaSyqPidoEgBaVltdXncDOf5b9dpqgrokL6ESaCNp5qbg L/SsqPi5ZtpUsouwW3ffuVkf2UDAxDCl1SdBu9WWqxKayYTPhUc8kwICtY7eUhFr+kpU 5HUEBuMR6iAfxe0njfd0kknXHXAei+wsz9H4XzCAy+tpuSy2YNWN+BekNtlfNidfMmHZ jtQZE2M+IblnsVBWWfjXBSN6oYXc0fzqMuXl9TrMyype/QqE2kv8B+4ddgyLzi/5bSCi BJM8gcvHWkiHYxnwqJDFI12XURRNkk3hWb822BS5vSi13Q2rJtMIMTXjHQjyYLPJHyvu UJzA== 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; bh=lOLK5+RzyBRplnlwJ9MbxBBdfQY5yrHSwnQ5CraT9BM=; b=t8TlYM3XnXnt4nSGRO+po4SIE08uVhZx9jUowBo3gEWNnFt8DXPwwXFT1cLHzfbnfm Ld6dmXna285rwOkzjvD5U1ZcEvBJq1J9ORypQ+pEOe+tfXEnynaBoiCOrgAZvjD2aTbq n6mFFfiVee71cflw0AvBIAVYQdNRHDocuQo7cnv19RMth9i9vMoIzS0iqldI6O4FC3dK HZy84SPOl8xka+OmmK+GufxVW44Ov6/Tr4HrGvAApURVBPilVxMnLx3PTp9vr4hCLHZk 5YbWWRyY7APyf+eTS6JPTP2ydIYnS3m04gltX1p+kBG5bCkbZNtzS6dDsG2lml0zf2K4 SQRw== X-Gm-Message-State: AODbwcBzM2PCtLEV0acPX5COsji0MqDB51ELuARtZ1PIOg3Ne61MtQn3 oGGLz9azMJGIEg== X-Received: by 10.98.85.6 with SMTP id j6mr2984692pfb.31.1494574564847; Fri, 12 May 2017 00:36:04 -0700 (PDT) Received: from MacBookPro.localdomain ([219.246.178.177]) by smtp.gmail.com with ESMTPSA id s83sm3874037pfa.128.2017.05.12.00.35.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2017 00:36:04 -0700 (PDT) From: Xie Qirong To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo Cc: linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Xie Qirong Subject: [PATCH] brcmfmac: btcoex: replace init_timer with setup_timer Date: Fri, 12 May 2017 15:35:55 +0800 Message-Id: <20170512073555.12333-1-cheerx1994@gmail.com> X-Mailer: git-send-email 2.12.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The combination of init_timer and setting up the data and function field manually is equivalent to calling setup_timer(). This is an api consolidation only and improves readability. Acked-by: Arend van Spriel Signed-off-by: Xie Qirong --- setup_timer.cocci suggested the following improvement: drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c:383:1-11: Use setup_timer function for function on line 384. Patch was compile checked with: x86_64_defconfig + CONFIG_BRCMFMAC=y + CONFIG_BRCMFMAC_USB=y + CONFIG_BRCMFMAC_PCIE=y + CONFIG_BRCM_TRACING=y + CONFIG_BRCMDBG=y Kernel version: 4.11.0 (localversion-next is next-20170512) drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c index 14a70d4b4e86..3559fb5b8fb0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c @@ -380,9 +380,7 @@ int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg) /* Set up timer for BT */ btci->timer_on = false; btci->timeout = BRCMF_BTCOEX_OPPR_WIN_TIME; - init_timer(&btci->timer); - btci->timer.data = (ulong)btci; - btci->timer.function = brcmf_btcoex_timerfunc; + setup_timer(&btci->timer, brcmf_btcoex_timerfunc, (ulong)btci); btci->cfg = cfg; btci->saved_regs_part1 = false; btci->saved_regs_part2 = false;