From patchwork Thu Sep 21 11:47:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 9963791 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 8532D6056A for ; Thu, 21 Sep 2017 11:48:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7123F2947D for ; Thu, 21 Sep 2017 11:48:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65E4E29480; Thu, 21 Sep 2017 11:48:52 +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 C71DE29481 for ; Thu, 21 Sep 2017 11:48:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751550AbdIULrv (ORCPT ); Thu, 21 Sep 2017 07:47:51 -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 Received: by mail-pf0-f193.google.com with SMTP id e69so2391876pfg.4; Thu, 21 Sep 2017 04:47:50 -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=az5VoSyit19Ifqj3CqBoZ7K9Re6+UnWI6HnfI0T1Ka0=; b=VgldlqmDV0W57mzaHSD9Eb3HoN/zbH93Q7WylVICIdMYjXIdjxcN8fb/IH7//iAd6C Zh9+/abc6lg3Z2eV2vk0Bi+dh+sYeALlkHa1PAYFzY8H5CuUUiw10vmKyKNGpOdBmb0M idbuDMQ4Kl/hUnJAnUyCPMtEIQSEAiYYfF0K3rIXlx084o4rdPUoZ4IFIDcTL1P1AAEo qQUrw7pQeu+Ho4q1F2HmIwpSADAghvCBLrL6kEWSdVjPsskaRA+XTpFZhQ16ppfqSB9N zcKjHG2o6kzx3nL9fSJTxarL32EMFfJtk5eBkn3Z5YjS0vmDqldt1CZCBz44Szp5Dz1l QAOg== 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=az5VoSyit19Ifqj3CqBoZ7K9Re6+UnWI6HnfI0T1Ka0=; b=CbP+F+pqHNDSaFrx3Ehs/7vNh3G+VBsy1mrfp1xLq9Zy0+pKKbRVydcqxhOTxAdiel LImCmLzRNuUJ9D96a94UzbNvIwxMkrMrpu2QYBYBCes7/VyIKK32s324UubSjleEG4og zxUpw8RAwox97kbDmk+0Hlmc11imelrAvYQ/PW/oikJIS2o/Cus7BkvOZcAGlOExsi8A Y6qv8kDD+/H//jjjBtoDV9Bjgjvdh7MSqH1hSWIMxZa/D90gylgTT40sk307LhYphs4D lT8RIUMw1Nsa1MCxJNHhouNCE2GGA9rP6y9m8P0xpCWPZFbo7V9W+CIYyygWNzkNAQ7Q 1XVA== X-Gm-Message-State: AHPjjUg6sd6k8+7vqWlWMrm553uKfIBJFvWLku0zy7vLMFBSFmY4TsFc q7GA7xca37cYtGq3pDrkWCYrUsXm X-Google-Smtp-Source: AOwi7QALvzrWlrfKtjn9EJj3HjVec2nexMwpnIBL4rNhqdDvotXwkIWb1QUBcvg7mifo52DMvPQkuQ== X-Received: by 10.101.87.139 with SMTP id b11mr5323528pgr.186.1505994470114; Thu, 21 Sep 2017 04:47:50 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id a78sm3429645pfl.39.2017.09.21.04.47.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:47:49 -0700 (PDT) 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-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 Acked-by: Chad Dupuis --- 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,