From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbdIULrw (ORCPT ); Thu, 21 Sep 2017 07:47:52 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37626 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436AbdIULru (ORCPT ); Thu, 21 Sep 2017 07:47:50 -0400 X-Google-Smtp-Source: AOwi7QALvzrWlrfKtjn9EJj3HjVec2nexMwpnIBL4rNhqdDvotXwkIWb1QUBcvg7mifo52DMvPQkuQ== From: Allen Pais To: linux-kernel@vger.kernel.org Cc: QLogic-Storage-Upstream@qlogic.com, linux-scsi@vger.kernel.org, Allen Pais Subject: [PATCH 1/1] scsi: bnx: use setup_timer Date: Thu, 21 Sep 2017 17:17:44 +0530 Message-Id: <1505994464-11465-1-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais --- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 6844ba3..a056211 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -1946,11 +1946,10 @@ static void bnx2fc_fw_destroy(struct bnx2fc_hba *hba) { if (test_and_clear_bit(BNX2FC_FLAG_FW_INIT_DONE, &hba->flags)) { if (bnx2fc_send_fw_fcoe_destroy_msg(hba) == 0) { - init_timer(&hba->destroy_timer); + setup_timer(&hba->destroy_timer, bnx2fc_destroy_timer, + (unsigned long)hba); hba->destroy_timer.expires = BNX2FC_FW_TIMEOUT + jiffies; - hba->destroy_timer.function = bnx2fc_destroy_timer; - hba->destroy_timer.data = (unsigned long)hba; add_timer(&hba->destroy_timer); wait_event_interruptible(hba->destroy_wait, test_bit(BNX2FC_FLAG_DESTROY_CMPL, -- 2.7.4