From patchwork Mon Aug 18 06:01:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 4733801 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C65B9F344 for ; Mon, 18 Aug 2014 08:58:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A309200F4 for ; Mon, 18 Aug 2014 08:58:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEC482010E for ; Mon, 18 Aug 2014 08:58:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbaHRIzd (ORCPT ); Mon, 18 Aug 2014 04:55:33 -0400 Received: from p50936449.dip0.t-ipconnect.de ([80.147.100.73]:30499 "EHLO dhcp-27-160.brq.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752442AbaHRIzc (ORCPT ); Mon, 18 Aug 2014 04:55:32 -0400 X-Greylist: delayed 10355 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Aug 2014 04:55:02 EDT Received: from dhcp-27-160.brq.redhat.com (localhost.localdomain [127.0.0.1]) by dhcp-27-160.brq.redhat.com (8.14.8/8.14.8) with ESMTP id s7I62VPW007866; Mon, 18 Aug 2014 08:02:31 +0200 Received: (from agordeev@localhost) by dhcp-27-160.brq.redhat.com (8.14.8/8.14.8/Submit) id s7I62ULL007865; Mon, 18 Aug 2014 08:02:30 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Naresh Kumar Inna , Arvind Bhushan , linux-scsi@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v3 09/13] csiostor: Remove superfluous call to pci_disable_msix() Date: Mon, 18 Aug 2014 08:01:49 +0200 Message-Id: <32f317b013341f51bab2a4869108772781862da6.1408335523.git.agordeev@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no need to call pci_disable_msix() in case the previous call to pci_enable_msix() failed Signed-off-by: Alexander Gordeev Cc: Naresh Kumar Inna Cc: Arvind Bhushan Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org Reviewed-by: Tomas Henzl --- drivers/scsi/csiostor/csio_isr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c index 7ee9777..91ba91d 100644 --- a/drivers/scsi/csiostor/csio_isr.c +++ b/drivers/scsi/csiostor/csio_isr.c @@ -529,10 +529,8 @@ csio_enable_msix(struct csio_hw *hw) csio_reduce_sqsets(hw, cnt - extra); } } else { - if (rv > 0) { - pci_disable_msix(hw->pdev); + if (rv > 0) csio_info(hw, "Not using MSI-X, remainder:%d\n", rv); - } kfree(entries); return -ENOMEM;