From patchwork Thu Sep 21 12:43:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 9963851 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 525CF6056E for ; Thu, 21 Sep 2017 12:43:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46530294C5 for ; Thu, 21 Sep 2017 12:43:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AF9D294C7; Thu, 21 Sep 2017 12:43:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E41BD294C8 for ; Thu, 21 Sep 2017 12:43:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751606AbdIUMnP (ORCPT ); Thu, 21 Sep 2017 08:43:15 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34252 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbdIUMnO (ORCPT ); Thu, 21 Sep 2017 08:43:14 -0400 Received: by mail-pf0-f194.google.com with SMTP id g65so2453979pfe.1; Thu, 21 Sep 2017 05:43:14 -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=8umpMSXvhHuFG7V2T+2lcpnCeL9yG2RHM89oWlxvSEI=; b=twjz3X3H74fyZoi75Qxww5gQMo111tAAMQ/LTdJ2dbUvvZAoIYLp1nkJaJi2tsAv8x GLIYEPaurNZ2+gbLPMqWRqnuRREdYZxZw0QFVYJm6EbsT9f0JBDuJQlBENh/vVIB2l4t U1r00zhPg8eKrdWrEBsSOIQUANrE4RsSwGWqRKv8L1mxibLHusepYkEBkmITh6QNDOvk 4EEngRsmEz4rJLB/a7Rot5yJz/hIFoYogchXfoqHRhUVjqM7kJ18JqkL5H6H22/meqSi NAa7rxdlEDpugjuUu+IXM203yUG+q9K/U0XOmuTPzopMXt6bWQffrjDXn4MYaghuNZO9 1xSQ== 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=8umpMSXvhHuFG7V2T+2lcpnCeL9yG2RHM89oWlxvSEI=; b=q6SWCSHf2wNqcRn4QYYPnOIGH5FaaHP8C3fhAYhZhPKb0XSZG+QRtRUm6yBgrdLKWQ O4Z1QSElM2mn9FUtdMoSiP8t07ODITui2+U5bn3auFpsqzulcW6Nv3K3yCMrpyhUzTd+ 9N/IvnuJEf/vMb6+hkoyhvrbNx4efimFktmF0MPiIQUzGYFoGwW+GEy6L3P3bu5975Wq SdoKiiX99uejs+kDRMFXEh2F44SIvFRB/ESyZhLDbJNN6ubPSS6LJgXxoPGLOvDIsciV 8swQu5lp9bF37Go2Fi23QERnK7xTBuLthv35FhcW0/BAe1ovMdRA5eiYxJqWp4qTHhCu jSvQ== X-Gm-Message-State: AHPjjUhVTgNFLBD0M/RKCa9gkSpjwpBmTlNHpAyjuFK6n4eeU7S1QWNG C+wt20pgs7HfZCQDPkaIGXBDJTge X-Google-Smtp-Source: AOwi7QDcNsdswb0ObQHkSE8ulLM5qVK/Ed8Qy4I0Zbrvuqf4tYhB570E1SB8NZ8grKwUVlCqdbuF5A== X-Received: by 10.99.185.86 with SMTP id v22mr5900700pgo.236.1505997793318; Thu, 21 Sep 2017 05:43:13 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id z24sm3033695pfk.3.2017.09.21.05.43.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 05:43:12 -0700 (PDT) From: Allen Pais To: linux-kernel@vger.kernel.org Cc: arend.vanspriel@broadcom.com, kvalo@codeaurora.org, linux-wireless@vger.kernel.org, Allen Pais Subject: [PATCH 1/1] wireless: broadcom: brcm80211: use setup_timer() helper Date: Thu, 21 Sep 2017 18:13:06 +0530 Message-Id: <1505997786-12815-1-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 613caca..5adce0e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4144,10 +4144,8 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) init_waitqueue_head(&bus->dcmd_resp_wait); /* Set up the watchdog timer */ - init_timer(&bus->timer); - bus->timer.data = (unsigned long)bus; - bus->timer.function = brcmf_sdio_watchdog; - + setup_timer(&bus->timer, brcmf_sdio_watchdog, + (unsigned long)bus); /* Initialize watchdog thread */ init_completion(&bus->watchdog_wait); bus->watchdog_tsk = kthread_run(brcmf_sdio_watchdog_thread,