From patchwork Fri Apr 10 22:55:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 460262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 064941402F5 for ; Sat, 11 Apr 2015 08:55:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=ZOc5HwEP; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932229AbbDJWzU (ORCPT ); Fri, 10 Apr 2015 18:55:20 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:37387 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932205AbbDJWzQ (ORCPT ); Fri, 10 Apr 2015 18:55:16 -0400 Received: by igblo3 with SMTP id lo3so9501632igb.0 for ; Fri, 10 Apr 2015 15:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=JrsJWG/IhU2Xtwb6GvxjeSdejF//lkV6YkyU9rxpgQs=; b=ZOc5HwEPLbCMlcIK8hmjg0cBtomr+pD6OSmVDoOLoPbHTqtnfCOHrUtrGMBpqavreN oqLqOIHPOsXkbAGQM0XDck97FwD+Ij8ENOwVUkEBg/H+7cpXk/jsYSKZ96OMDqgelkHj aQiYFUUBYRkm+SeGfSjG62HfwBlmt9FzzCwfruVJWQe9IeT5INDz+BWsY+ok3R4CRCxv PPSNKSwaGJtvV6IKh84tltkzkukcQPXS588lFyuG6TcWTnTWWSI/tpFJ8vLwU7AV/p/o mORFNUPeJget359hQtmtWRYg7P27imQ3PBSu1UC1u7lGETmVQDsTDwkohk9rB+HmK8Hk fEng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=JrsJWG/IhU2Xtwb6GvxjeSdejF//lkV6YkyU9rxpgQs=; b=T6fiOQfLxPGEvOJSBNVvDtVjW48SN7LSglAorBN8cgIuJy2pcgnJK7EKupczgY9WwC 9+MKTsU/b/PcIjtHSOqIiX0lbQjX+FVOg/aKwHFoeabk5fEheyV2c9HDs0h79SA8MsWw HOtNR7N21aLxFUVjqfd5GHLNcFYPwIShMDoeu3ENSi4S1r5NZq43sWNAohtJE8DF2uqz pm+EHIWezvjbR825THpTJNRgEUBQ3PdszIDKPkYYjIjecBFY6XFAs082reY/FPsNXjIc HTCthjFsh7hHA1rJcTX4KLZWbiMlWZu8aTS7VfLBVS1BDRSas5dlfpBda/ONYVyhVxeq 4m/w== X-Gm-Message-State: ALoCoQlIR4iMWKp1s5GEzJjVADarrZQSaojxVEqmMEcwp/TVZqkqRFmsX0E6f/mfialQsMetYBid X-Received: by 10.107.11.81 with SMTP id v78mr6267481ioi.66.1428706515878; Fri, 10 Apr 2015 15:55:15 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id w9sm187274igp.3.2015.04.10.15.55.15 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 15:55:15 -0700 (PDT) Subject: [PATCH v6 08/10] mic: Drop pci_msi_off() call during probe To: "Michael S. Tsirkin" From: Bjorn Helgaas Cc: Yijing Wang , linux-pci@vger.kernel.org, Fam Zheng , Yinghai Lu , "Eric W. Biederman" Date: Fri, 10 Apr 2015 17:55:14 -0500 Message-ID: <20150410225514.20848.44500.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Michael S. Tsirkin The PCI core now disables MSI and MSI-X for all devices during enumeration regardless of CONFIG_PCI_MSI. Remove device-specific code to disable MSI/MSI-X. Signed-off-by: Michael S. Tsirkin Signed-off-by: Bjorn Helgaas --- drivers/misc/mic/host/mic_intr.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/misc/mic/host/mic_intr.c b/drivers/misc/mic/host/mic_intr.c index d686f2846ac7..b4ca6c884d19 100644 --- a/drivers/misc/mic/host/mic_intr.c +++ b/drivers/misc/mic/host/mic_intr.c @@ -363,8 +363,6 @@ static int mic_setup_intx(struct mic_device *mdev, struct pci_dev *pdev) { int rc; - pci_msi_off(pdev); - /* Enable intx */ pci_intx(pdev, 1); rc = mic_setup_callbacks(mdev);