From patchwork Fri Sep 22 09:51:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 9965701 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 DE51C600C5 for ; Fri, 22 Sep 2017 09:52:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC8372982C for ; Fri, 22 Sep 2017 09:52:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D133629843; Fri, 22 Sep 2017 09:52:07 +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=ham 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 784A22982C for ; Fri, 22 Sep 2017 09:52:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114AbdIVJwG (ORCPT ); Fri, 22 Sep 2017 05:52:06 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36599 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbdIVJwE (ORCPT ); Fri, 22 Sep 2017 05:52:04 -0400 Received: by mail-pg0-f65.google.com with SMTP id d8so363532pgt.3 for ; Fri, 22 Sep 2017 02:52:04 -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=N+4Ac50KNQ3eI7KhHn2DL7omypKBtG8aVR65DnIyekA=; b=Ip2vAd4G9+1tWqcGXCxgBdlGz0nyxscC8n2wBk+ZAYhXqUlBwFRDAkt+S25QNaimjR AW1omtXTU3571xGW0rhVezUBdF3TLplMqNbU+zC+EzdggzH+i9JxXomdQ9oigQvR3sWX D1VZ+qMr7bMJNSMju/wCQVUsOZlF87pOc5cu9CVY1XSEj8O8mzh/m/BUICkKQ0qqJCJZ hTQ5q1SabFH67EIP4A1u3nnaIJt/xDGftG6hZCEB8bMvbDPbK9spLSb36ToKXrK+2ekS 0LtHV9h8Sze9sweM3qb4rkzJe4d4TZcjxvRWGgeYYJyENnDveD5cwQMsUQw/3gDiCI0F Lg/w== 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=N+4Ac50KNQ3eI7KhHn2DL7omypKBtG8aVR65DnIyekA=; b=VsA6R+ZhQFBW0pBQT+b3oI/Hgl+WqVaOb6RE+RFn96XV3KFuZvPSI5tlZDu9vO40fc mXHUF6SZITwCL5HvuMzYOgTbM8C/XmjhGht6EZWY0pNtjqP9I2smSEIVwyuRucO6U/Sy kspjr4kffPxBwhfSpAeoHEIC8I5RQLIdeVIQN2KvIVVVHjPR75W9CGga7p2dxGdWzkqm VvKr6U4NTkxlCyTtCa/63TzZoE8G6o7C4sEzKiVvnnVFUgA3wjdG1iETlIwaFX9j3EHL XOBGh2wzMEZUecXtMAs4deaYArMKqQfbzu+ayWXo/GuTemW+iuQWyRYORhNoImT0Wcwv +Ieg== X-Gm-Message-State: AHPjjUhE0yfuriz65Wf65kuIWR/LjIGKjHGqVKZFY5JrD4zZPg5tBvdK OoAw1HExYZchz6ik6Vc8yjvh5Om3 X-Google-Smtp-Source: AOwi7QBeX8LU3bdCWt2aG/T+MkVVvGJr1dJpa1geSoAC79qo/R14Yl7493K0xs4rgOYt/N0eLtE8Cg== X-Received: by 10.98.182.16 with SMTP id j16mr4646648pff.271.1506073923529; Fri, 22 Sep 2017 02:52:03 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id k13sm5611977pgo.51.2017.09.22.02.51.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 02:52:02 -0700 (PDT) From: Allen Pais To: linux-scsi@vger.kernel.org Cc: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, linux@armlinux.org.uk, oliver@neukum.org, aliakc@web.de, lenehan@twibble.org, lduncan@suse.com, cleech@redhat.com, matthew@wil.cx, Allen Pais Subject: [PATCH 02/13] scsi: qla2xxx: use setup_timer() helper. Date: Fri, 22 Sep 2017 15:21:34 +0530 Message-Id: <1506073905-12985-3-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506073905-12985-1-git-send-email-allen.lkml@gmail.com> References: <1506073905-12985-1-git-send-email-allen.lkml@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@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/scsi/qla2xxx/qla_inline.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index 9a2c86e..34cdb5d 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -269,10 +269,9 @@ qla2x00_rel_sp(srb_t *sp) static inline void qla2x00_init_timer(srb_t *sp, unsigned long tmo) { - init_timer(&sp->u.iocb_cmd.timer); + setup_timer(&sp->u.iocb_cmd.timer, qla2x00_sp_timeout, + (unsigned long)sp); sp->u.iocb_cmd.timer.expires = jiffies + tmo * HZ; - sp->u.iocb_cmd.timer.data = (unsigned long)sp; - sp->u.iocb_cmd.timer.function = qla2x00_sp_timeout; add_timer(&sp->u.iocb_cmd.timer); sp->free = qla2x00_sp_free; if (IS_QLAFX00(sp->vha->hw) && (sp->type == SRB_FXIOCB_DCMD))