Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2649320lqp; Mon, 25 Mar 2024 05:41:50 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWjo4n/3CqcAjZXDKdb3YygEEoiFio2+dlqWVGU0uFZIzWOXwwof/C6XOswBLe+x5N9GLlv+O/Jf/Wn6lVe8fOIhMkY/eJjl836W/Yv9Q== X-Google-Smtp-Source: AGHT+IFdeQzvf6occjnK+DVesAA6JWB0BFgFVIeAQzLj4hYPrlOqHqk91KEgg7QEjRVMLasGfp4J X-Received: by 2002:a05:6870:218f:b0:222:826f:163e with SMTP id l15-20020a056870218f00b00222826f163emr8517060oae.5.1711370510179; Mon, 25 Mar 2024 05:41:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711370510; cv=pass; d=google.com; s=arc-20160816; b=uMD5C6JqVK4/lA8ySeUC+V3Hp3E1tphtZpl2BKhPNHg440YgB0nX29q2EwjPhp6UyB /ojAsJQFl5NsIODTOOstFfcuF4h6fSRmWmOrWz76+GOXOOlZcW3a3fv+Qqgz95w9RiU4 2oKkfZRoVgOC9qG+HGFgph78pjZfytCbVjXntcVu9R3ejjqsAusTWAl+9o8NDvaR2L7T G7Jl+5z43UW71VCZiv3zcDr6spTojAVZAnYKWpdGdNAI2Ii+4c8PkiOq6r61FPyOc2qD QVZg6a9Ow2jJGkvTYga2Py4Fvu4HynrsqUPD91wd9lULYQsLF9z4VcT2g0pDj8PzP3qm CO8Q== 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=DTXFF30sctAChvMrfvMKLLb10gN4FhRyZmMYt15iK5k=; fh=PXKk0h5tOYrfvLOsca+I8y9oqIXj3i9JJuE9vl6NMgM=; b=kQ7kvfIYQgIEpT6yJWjSn5o8YLQ9FGnRlDUoIuh+GQIUY6CENsf63kM+pkLf3kfKtx TNVtOcRvW8i5mxU6h49UQNXRABTeLxIrsP3yIGl7V01aPn8qyzNj0C4uDWXFwj/l/t+o Qxa1PbGuR0RuiYqGCse9IuUaOi1gA5ddxBEHFmWAGiVI9L+q6lpDNl8uLYXaW/ovm48G F4onze2QHdIcTy33qFwi5+IhDph4RqRFweEcDP8cPqZBrivg5sqvRJTKP6FlmFevZTmv yV8/Lw17n2dUOwAHJkyiL9gxgAmVtvKk2gtAdFChOPbTf30hGlDGjMmmddbnacTu7dmK FjKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EQF88+Zs; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116492-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116492-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id o23-20020a63e357000000b005dc8554d4f6si7674815pgj.49.2024.03.25.05.41.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116492-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EQF88+Zs; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116492-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116492-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 7E5842A4AA9 for ; Mon, 25 Mar 2024 12:40:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 48CCD13E02A; Mon, 25 Mar 2024 07:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EQF88+Zs" 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 395F2181327; Mon, 25 Mar 2024 07:10:57 +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=1711350657; cv=none; b=C25nZs1Z+c8QewNnM01J3PrQ/wUZBjyxmGvV59xs5I921E2TWnYj3trOx9tWXdtyJ9V4XxqrwikNLsoKa2FlKNioQU6sqeusSKZwGwL2haCR0hE+58B4BV7a82ampHWDU4AZXKjdUXPdCswBoGHm1qQB2UrIJJ84TVz6tzoARpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711350657; c=relaxed/simple; bh=XKJ4PdWS7sPUSp/i639lPoqRweHPQBN/JvN8m6hg+pc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LZ991KGX2GfLmDzEWtmhsngjr/ZCoXt83QhHp1FxCCZeTnfUDxOhC7X97Ccw+FXOmlFSpADEZZzkbSSOoUe0zopAafolfZ2YBeqbofz8RK/VkuMA7WVYkUccG3S4RqqroEbxL74QYBYR8pyeRipFrZKeIQSBXMs9XTSu1hGnxis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EQF88+Zs; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BCE5C43390; Mon, 25 Mar 2024 07:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711350657; bh=XKJ4PdWS7sPUSp/i639lPoqRweHPQBN/JvN8m6hg+pc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EQF88+Zsdyl9+YqNvdRhZaeBdFtqwsmgLnRE2ZYEQO91OQDEssBs1HPYFOydw2Y/c q9fVT5yFUBshGdvC1nUwagh7ju47fKIHz84i+Kl0muQiajdyvAcnGrWwVPBVKT9G7i USMISh4UGA5PG/UwiADc9Diq32hAG2W8nPjC9IMpbUEg9z+qL+RoATwb/JLfpgPlhz Em6NmF8VDQuJbxefV/WmGaqGuE3aZePf4TtuO3WeiAJagXHfk082h9jsD/qBidsVoD 6tsgfsehwBOgri2r63Ealv34YI6KGsuvwWNrnRxGVU/59jD+ALjfzcF5ZDBs0DLce0 +1KV1UDFRbPWw== 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 18/28] net: wangxun: Use PCI_IRQ_INTX Date: Mon, 25 Mar 2024 16:09:29 +0900 Message-ID: <20240325070944.3600338-19-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 Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY macro. Signed-off-by: Damien Le Moal --- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c index 6dff2c85682d..ae0b940717a8 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -1674,14 +1674,14 @@ static int wx_set_interrupt_capability(struct wx *wx) /* minmum one for queue, one for misc*/ nvecs = 1; nvecs = pci_alloc_irq_vectors(pdev, nvecs, - nvecs, PCI_IRQ_MSI | PCI_IRQ_LEGACY); + nvecs, PCI_IRQ_MSI | PCI_IRQ_INTX); if (nvecs == 1) { if (pdev->msi_enabled) wx_err(wx, "Fallback to MSI.\n"); else - wx_err(wx, "Fallback to LEGACY.\n"); + wx_err(wx, "Fallback to INTX.\n"); } else { - wx_err(wx, "Failed to allocate MSI/LEGACY interrupts. Error: %d\n", nvecs); + wx_err(wx, "Failed to allocate MSI/INTX interrupts. Error: %d\n", nvecs); return nvecs; } @@ -2127,7 +2127,7 @@ void wx_write_eitr(struct wx_q_vector *q_vector) * wx_configure_vectors - Configure vectors for hardware * @wx: board private structure * - * wx_configure_vectors sets up the hardware to properly generate MSI-X/MSI/LEGACY + * wx_configure_vectors sets up the hardware to properly generate MSI-X/MSI/INTX * interrupts. **/ void wx_configure_vectors(struct wx *wx) -- 2.44.0