Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2661277lqp; Mon, 25 Mar 2024 06:03:35 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWBmZ5xHG8HAelKjjQP2lcTKCA4x9JQmTDlM94cBvTexc+gp/YY5OS2Ju36N18Pf2PdPYM+FCF8Sslwk1aL09v6BfqWSdeH720tCQagjQ== X-Google-Smtp-Source: AGHT+IEETHQJeB6VKB2q3wOF8Yky8gP7m7Gub4+vdndaY3XpqXAnm++5JO6urVRkkUly1TAIcqbU X-Received: by 2002:a17:90a:b397:b0:2a0:6676:fc9e with SMTP id e23-20020a17090ab39700b002a06676fc9emr2217461pjr.42.1711371815402; Mon, 25 Mar 2024 06:03:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711371815; cv=pass; d=google.com; s=arc-20160816; b=RY/CX536EdxMewBEzCsGIbrDHNNsD81K6Op6sPfsl95jNXFCh/T/a3TqNCloaQ6tpE zvvDcvlwmFo/Mc/wW/vkKmGhPgaC3jF+ygBb485yZQLjOMf6EaT9QY/WjpRTfKcXGgbk GAL/yE6gtA9uaNdzpGagPpZg2dVeXlJBdMCqFrq+8b/yS/NRN6j1hes5UarrHNHqb0Ci l+fOOFpWit6OH9bZq3iNOmVTiMMY/c9MUH3C4RaSJ0Ucbmd9eXQnuMkvKWUk6q7g89/U eydcBcdof1bqL5Axaj3nAZtNLYIjvxjUJNPhlSMfFN4pJf/KipNn4u3F7LDqCLI/gyVP 6NJQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=pfQtw4lRXmc1XWF1fR7Dx7j28tDzBcZpFZSEbxPzeZk=; fh=PXKk0h5tOYrfvLOsca+I8y9oqIXj3i9JJuE9vl6NMgM=; b=n8qwl5RSi90TbW3yndg+6SmJ0ZiNKa62O7Cvb3WNOmulXAU1tDCSKkKqqiYOs69Z9x WrOu+D464DlAx1KV+gA5aRc7XN1wTidFaCAnnoPN5i1Yx/fuPRjQikinPjn0H3fYsKt9 1pGANurL38JLj66oN1e9x6UuAjnO0mwzSju+8amvDwGPM+z5jCzP0khr8/Qge+n1+aFk bCEkeWrM8ZzQA0mCTmNPiAm61RNHHIp+px0AVMB0NEdhRfNeHU3d6+0oVW+kWkEtrA6F 1vb62ZdbqB2Tfk6Xf+48h3cAIML4Jz24GYhRGImcCGjxk6lrnI0JVrSCD/p44l4EXiKK kGkg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nu67yIa1; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116489-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116489-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id v17-20020a17090a899100b0029be5633e4asi7655132pjn.113.2024.03.25.06.03.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 06:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116489-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nu67yIa1; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116489-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116489-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 1B4F7B32521 for ; Mon, 25 Mar 2024 12:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CCA461A2F66; Mon, 25 Mar 2024 07:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nu67yIa1" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B7D0152E11; Mon, 25 Mar 2024 07:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711350695; cv=none; b=lNZkBxFLZPkjZmVxHj11Ymw157AZsULfOjFhKGyRbCrOO1IasAGi9iqPhX7cUO714wlTAkn5MW+z5FaHcwCIjkTdfTM2F3EiK/35+plZNc12KC7rzS0B7GaKkZ9rcEr4J2T4lIBNS72wvBXwLcm6lf5/GuKwkfWdBP14AsNI0N4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711350695; c=relaxed/simple; bh=cNYwknOCoYozJYQki18ub+BQTqAuTBwIbKmwkZH+Rdw=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RubJxn5LDtsaFFsN8ElWOB4VQ40FV0ueGEpinrINFx2NUgSHRpuWYR4Z1ULMSBo0psDrE5j84wJ5EhVbFWMBIlE+pFpMQfmJimVsEo09ujaol462NJbI0pDmXpI3HpJScdirNSjxzv4HVq3WXNlw0p6oF8c3PjuUyzKX6aHpdn8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nu67yIa1; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B49A5C43390; Mon, 25 Mar 2024 07:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711350695; bh=cNYwknOCoYozJYQki18ub+BQTqAuTBwIbKmwkZH+Rdw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nu67yIa15SCpfTJanXaBWhOku7Ap2WldWog9PIvPYtQPZeiYE926Hie6SdsjloJH6 YQ6R8skFC+9ab9kVrHZFuyLivI+Q1eWoHLN5yxo/pgnMhkeb5Pi3wVMr/YnG8STYFh sOQiwxOgY7p6DxYSBLLIPJ9mTqOqzcLEh/tXKSVLeip3JGYceudpbifFCjbV5FqCBq 8HITItpYSLpEC1F2HzymMHHFEul4WNVKbPWXqQhHogxudlpl7p5i8PRE9nC5tDBgnc l4pnrR7cP7UAlAso5G48ciHZN4QbC/+8mjek7+1x7jWuc1SMzH55HvRQyXAAFQWm2f vjO+LHlblY5ww== From: Damien Le Moal To: linux-pci@vger.kernel.org, Bjorn Helgaas , Manivannan Sadhasivami , linux-scsi@vger.kernel.org, "Martin K . Petersen" , Jaroslav Kysela , linux-sound@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-serial@vger.kernel.org, Hans de Goede , platform-driver-x86@vger.kernel.org, ntb@lists.linux.dev, Lee Jones , David Airlie , amd-gfx@lists.freedesktop.org, Jason Gunthorpe , linux-rdma@vger.kernel.org, "David S . Miller" , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 28/28] PCI: Remove PCI_IRQ_LEGACY Date: Mon, 25 Mar 2024 16:09:39 +0900 Message-ID: <20240325070944.3600338-29-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325070944.3600338-1-dlemoal@kernel.org> References: <20240325070944.3600338-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the last references to PCI_IRQ_LEGACY with PCI_IRQ_INTX in pci.h header file. With this change, PCI_IRQ_LEGACY is unused and we can remove its definition. Signed-off-by: Damien Le Moal --- include/linux/pci.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/pci.h b/include/linux/pci.h index 16493426a04f..b19992a5dfaf 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1077,8 +1077,6 @@ enum { #define PCI_IRQ_MSIX (1 << 2) /* Allow MSI-X interrupts */ #define PCI_IRQ_AFFINITY (1 << 3) /* Auto-assign affinity */ -#define PCI_IRQ_LEGACY PCI_IRQ_INTX /* Deprecated! Use PCI_IRQ_INTX */ - /* These external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI @@ -1648,8 +1646,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode, */ #define PCI_IRQ_VIRTUAL (1 << 4) -#define PCI_IRQ_ALL_TYPES \ - (PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX) +#define PCI_IRQ_ALL_TYPES (PCI_IRQ_INTX | PCI_IRQ_MSI | PCI_IRQ_MSIX) #include @@ -1719,7 +1716,7 @@ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs, unsigned int max_vecs, unsigned int flags, struct irq_affinity *aff_desc) { - if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1 && dev->irq) + if ((flags & PCI_IRQ_INTX) && min_vecs == 1 && dev->irq) return 1; return -ENOSPC; } -- 2.44.0