From patchwork Thu Sep 21 17:04:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 817129 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="RIdNQrlN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykLp72gnz9s3T for ; Fri, 22 Sep 2017 03:36:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752097AbdIURG4 (ORCPT ); Thu, 21 Sep 2017 13:06:56 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33382 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752057AbdIURGw (ORCPT ); Thu, 21 Sep 2017 13:06:52 -0400 Received: by mail-pg0-f67.google.com with SMTP id i130so3750925pgc.0; Thu, 21 Sep 2017 10:06: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=FWxlF0OPhNQqmrD+z5XAmdOwFdCtwbZZRC/cwKkpj+E=; b=RIdNQrlNG2qGiohpcxUh7TUIRyWFZQYg6aisb1NV12qX22rTjh+x0L0krWcqC2yRim apiIYRltLQ8R2qN3X16OwQcb2Ed2NNha8y7jpphVqIXZV67pypNbkV/v6tokKizsOfQy sZhMsgbp+LzAKSs2HiRH/wJ3EsMjuiuO+IzhtFuNk4XkhriIUs34z5gmZWee1hZAeAkZ D38Vn3v4nYngQOAsDXaORKrn/m9UbOOpCUoD+xsemsTO/V0mYg5nBvBmPfwbQAu+cOOt KXDi96uypvxS/KDcQBlTGnGVNIqEOApAVAEbb3jW6E/sHXSV+nwkFj79hdI5oguDj7gn wepA== 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=FWxlF0OPhNQqmrD+z5XAmdOwFdCtwbZZRC/cwKkpj+E=; b=H9eazxG/pJbbQPDtGWR1A/P/Qm2IPu+l9QHvifehGIp5HNckyrB+nkvIwqQk6zqhqC lyH3zGGJ4/Z5yZGdPv97sWIdZm3pBUowLzrk2iZZupn2aU5kOKevxG2ybEX6GgHC1uLN 6nOjAOdZeEksYo6m0T+wwpuKqeuD9/GOsrVVTxr2PPj0FOBIWMNmLVvaFDCnQaYGwWfp +xnDRz7E6hGtSTwN2sAE2gIGQWLxgD4+XXuF3evCOPFQdWn29rUwp6jtIOXG83kfmeRi sIDVhiYaNXEV3o6RlO323yc/K2NrDzJ3JlmOZF16uAXRIOtnPW8YEnl49Idx/U7HEe4C K3sg== X-Gm-Message-State: AHPjjUiBNFHAZGk7n5o9+AyP/miRH103ctZKH4fm5DMnHmCFqZC1TVLz /qcfNUZ8nxyRdqxZ6qT8qSJ6yNA3BF4= X-Google-Smtp-Source: AOwi7QDBQHYvdjWZlT9N5nbu7R/SSfZtHnA7yOrGV0Di4aWTsbo0KcfiIiupT01jdSkIuOFh7AcVUQ== X-Received: by 10.98.12.84 with SMTP id u81mr6365815pfi.93.1506013611644; Thu, 21 Sep 2017 10:06:51 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.06.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:06:50 -0700 (PDT) From: Allen Pais 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 Subject: [PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:32 +0530 Message-Id: <1506013525-29291-12-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: 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 --- drivers/net/wireless/rsi/rsi_91x_hal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c index 070dfd6..7ad286d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_hal.c +++ b/drivers/net/wireless/rsi/rsi_91x_hal.c @@ -411,9 +411,8 @@ static void bl_cmd_timeout(unsigned long priv) static int bl_start_cmd_timer(struct rsi_hw *adapter, u32 timeout) { - init_timer(&adapter->bl_cmd_timer); - adapter->bl_cmd_timer.data = (unsigned long)adapter; - adapter->bl_cmd_timer.function = (void *)&bl_cmd_timeout; + setup_timer(&adapter->bl_cmd_timer, (void *)&bl_cmd_timeout, + (unsigned long)adapter); adapter->bl_cmd_timer.expires = (msecs_to_jiffies(timeout) + jiffies); adapter->blcmd_timer_expired = false;