From nobody Mon Feb 9 18:23:02 2026 Received: from wfout5-smtp.messagingengine.com (wfout5-smtp.messagingengine.com [64.147.123.148]) (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 6D121144D19 for ; Sun, 31 Mar 2024 13:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893048; cv=none; b=qheyQUtk6DGRBrx2KHheLfZpFQhIk9tjU9NXDnCi+Uq/QSyOyy1p2h0+CYuWtK73/OFKtno3ESINm1+xLaqtcyR0rIMiwuekRrq/7rweKQHq5Ws6HrY0d0IxpMmCsahqH/DVM25Tvy9ptA1U3xz9lO86NDogLOp8eJ11OOt26S0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893048; c=relaxed/simple; bh=w65z0QxskN7ZF9tF3NOX4hkXK+fx5BObox8xBpurGQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pck8zbQcowQmv7B+BHr2Hz4UZjDRfUqnYtmRVUdKtrGgqpqTpBhk3DrIQsCD91vRXzO+Bq5XdHCrUjLGj9PjzVN0Wk6nwMi0DBNcZyAvkYBKvQcivny5jJ6xoxuUq1RLoLAfABXOcUZCpEOXvWDVf0Pc0lvovRlrB0j6CO8ANRw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=kIMa6Wyi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=IZHwGU7V; arc=none smtp.client-ip=64.147.123.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="kIMa6Wyi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="IZHwGU7V" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id F32B01C000CD; Sun, 31 Mar 2024 09:50:44 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Mar 2024 09:50:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1711893044; x= 1711979444; bh=qkJRo23QIS6MlyibldBmAeHzIc3e5Kr0E1mP5LfohmM=; b=k IMa6WyiI4RF5Quvp9i5BL+2FjailCwKSJ9QEvcBVUYnaiSX712IrMEnIRLiT7aPQ RnDP8iLQahsdD9MYZVvKX9N11oCPLcmxhAaBVYC7a91I2xd8+Cr/PnAhFd6B07cx jkMCTpKFe9B45z1N0jsBQG+7k/3RMsX8EA36ZJIHPkKkg76Tp1Vookrkpeorkttj Ek/6ACzEoqSzZ6gYm5POUSywcQUT0DOVkSAz2S62HXlqn4j8DPQxgqsrR++XS6lH 8er0kwneEe4m9YwJkNn7OCJjECOr/UDMO6/zFVvP4hJFStvCMIrgqfoYCZqr44qT y/RopHaIuFcYYIZp8EFZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711893044; x= 1711979444; bh=qkJRo23QIS6MlyibldBmAeHzIc3e5Kr0E1mP5LfohmM=; b=I ZHwGU7VF97/j73JOg9bznshb4D3QMcR+0mm6fJ+Ep9gB6cl5MAcI7QFTl1s6IvO5 2470NTtDmbZD/d1WmdaDZsPYXXoC66+PVdzvYeE+IGSWyOuYKpFIgK8YHHIMG5CW pq0cmLUkEVblLkeZBKJzXJftTbBcqjvTddqiPR2iB7L97fvp/S1lN4yZVxzo47Nv 7bvL1M7QCHBdXfvGddeRoMvln+E4IygNTvlvWo6yJmb/V/HjmS7bUFFu8aL/zcMU /0JfSjs/CHKRnBhAKuolrLcnlyj7vq6Gvsem6QVORMBmABqlVDjV8MBFpEpQAGQZ 2m6JW9j0/zlLpFlFPu2gg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Mar 2024 09:50:43 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/4] Revert "firewire: ohci: use devres for requested IRQ" Date: Sun, 31 Mar 2024 22:50:34 +0900 Message-ID: <20240331135037.191479-2-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331135037.191479-1-o-takashi@sakamocchi.jp> References: <20240331135037.191479-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 5a95f1ded28691e69f7d6718c5dcbc149613d431. As long as allocating any device interrupt vector for MSI, it is inconvenient to utilize managed device resources for IRQ requesting. Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 7bc71f4be64a..f18019c5d220 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3750,16 +3750,17 @@ static int pci_probe(struct pci_dev *dev, =20 if (!(ohci->quirks & QUIRK_NO_MSI)) pci_enable_msi(dev); - err =3D devm_request_irq(&dev->dev, dev->irq, irq_handler, - pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, oh= ci); - if (err < 0) { + if (request_irq(dev->irq, irq_handler, + pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, + ohci_driver_name, ohci)) { ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq); + err =3D -EIO; goto fail_msi; } =20 err =3D fw_card_add(&ohci->card, max_receive, link_speed, guid); if (err) - goto fail_msi; + goto fail_irq; =20 version =3D reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; ohci_notice(ohci, @@ -3772,8 +3773,9 @@ static int pci_probe(struct pci_dev *dev, =20 return 0; =20 + fail_irq: + free_irq(dev->irq, ohci); fail_msi: - devm_free_irq(&dev->dev, dev->irq, ohci); pci_disable_msi(dev); =20 return err; @@ -3801,7 +3803,7 @@ static void pci_remove(struct pci_dev *dev) =20 software_reset(ohci); =20 - devm_free_irq(&dev->dev, dev->irq, ohci); + free_irq(dev->irq, ohci); pci_disable_msi(dev); =20 dev_notice(&dev->dev, "removing fw-ohci device\n"); --=20 2.43.0 From nobody Mon Feb 9 18:23:02 2026 Received: from wfhigh5-smtp.messagingengine.com (wfhigh5-smtp.messagingengine.com [64.147.123.156]) (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 36029144D28 for ; Sun, 31 Mar 2024 13:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893049; cv=none; b=IcJ5XA4QBC7Vpzdl+V+WUESxr6yB3VNZwIupCay+myletf+CCaNBBjYK6rOb8CV8whs9tllBGcooXd6vtqac+xhW0ot+0KzXiKV/2FCEyGjF2N6Eu8ekBvrgsuLkCltsmd10wCXL4JpQZqQ4AtzjbciHX9F6iDbNOWDAt9QdyGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893049; c=relaxed/simple; bh=qd6Hc1CnvuAkfK3DNjZ6oePksqpx6ygYsp1KXjodoYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lUCWN7Fhg5kndlMIzObdCcDkCF7BtSi5ad8hspm3tO55MdRFVXQJYy/JzH77kMCvL/Vc0SFq0ZZ4flQujp2It3EYPjJsL3fn4Mru1dHceWtfjQdauHFVz9H03QgDmqDxme0z3xiI3YMhUrJ1l4tnjfLBfYZxPqAHuyw/j7c/Qd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=BGN/rskT; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=rTTDVKf6; arc=none smtp.client-ip=64.147.123.156 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="BGN/rskT"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="rTTDVKf6" Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id 2E4E618000BC; Sun, 31 Mar 2024 09:50:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 31 Mar 2024 09:50:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1711893046; x= 1711979446; bh=c5UyzxdIo0EMw604i5z0Ke4dcgihgur2UN/owwURGQg=; b=B GN/rskTywntgx1+9BZn/VL+LKurmtOAdYtOJEuwkVWWBQ2KiSkupdcF0Thmpmolu udzqOHUQa5TM8/16lkcQyEhvvF9DpEDfKh4hGC7FoBMYl87Qu7lZPyaKF1DQO+zn a4BZmRicfpBHDOVN8VpPtFmXzmV0awhLIgfF+2XvVJB7Em68+aZQEv5DVJu4PDuY RxXakRsRB5pHLbjDDh4kf7dYPxzPnquq9RQp8RmzkjtQYkVqnJ5xhK56SYUvGlRX bEMordKvFZPPXll13dYR2YL9sbCmKOb1As88jnBjaj/WLmxf0QWkfLkk47Hfk2PV M0/1TIAQzw/rZ/tCGsn8A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711893046; x= 1711979446; bh=c5UyzxdIo0EMw604i5z0Ke4dcgihgur2UN/owwURGQg=; b=r TTDVKf6yrcUCxLSzcD1IwM4I9Q9mqBvRDggEp9aHBUjuLN2tUklCUhbtRcTeHz0c C9iHqxo/CajCh0rBgfnOyO3fNXjLqy5AFLKU9ppo73kjU9iIIU5RLQsnNWEzyYL3 RkUsHE4lDd0qEcEOlWrAk9K922KqoZVBMXQBK/8DwVag1FG6RYKVW/U+avlw02FK LqJACUXiG1vFyl9UODO4JLRGg9Bhan+/66jFNu0T0unbdot8JB4uTxJlA2tghxCF tIMfgBHe/RAzxPGSC4gUMw09UzwMTJEQ/PbfeKV7xSzwekXGILwWP+SQFSgCq5i/ sUo2RwERy/rEsITCed7cQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Mar 2024 09:50:45 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/4] firewire: ohci: replace request_irq() with request_threaded_irq() Date: Sun, 31 Mar 2024 22:50:35 +0900 Message-ID: <20240331135037.191479-3-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331135037.191479-1-o-takashi@sakamocchi.jp> References: <20240331135037.191479-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Nowadays request_irq() is a wrapper of request_threaded_irq(). The IRQ handler of 1394 ohci driver has never been optimized yet, while it is a good preparation for the future work to replace the latter. This commit replaces the former. Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index f18019c5d220..ec02708c5f05 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3750,11 +3750,11 @@ static int pci_probe(struct pci_dev *dev, =20 if (!(ohci->quirks & QUIRK_NO_MSI)) pci_enable_msi(dev); - if (request_irq(dev->irq, irq_handler, - pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, - ohci_driver_name, ohci)) { + err =3D request_threaded_irq(dev->irq, irq_handler, NULL, + pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, + ohci); + if (err < 0) { ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq); - err =3D -EIO; goto fail_msi; } =20 --=20 2.43.0 From nobody Mon Feb 9 18:23:02 2026 Received: from wfout5-smtp.messagingengine.com (wfout5-smtp.messagingengine.com [64.147.123.148]) (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 57AB2145332 for ; Sun, 31 Mar 2024 13:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893052; cv=none; b=u3TekDyblfW3H2eQn5KH0P1sCsFRh71xGdPysOtSDljUTU6t8izyjPyKMln6Bi1gHfue/jJopsTax6c0YMg7pLQw6h0VTPt0RjchqLAvA4OXFAzAAtt36E8k657o+KdLDMrgjsjn4SSjG3TyA7SsUhFl0QeWx03vFMAO02+Sxzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893052; c=relaxed/simple; bh=1YWQJPgEtzrWLiz5E4pGUghg2+MyIdPK3IgGgUl0n/8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cb2uA3baSN/M1vkikoAhy8C9WVR311uuoA5rxHuA3eCO2FVFR9OjRn8Pj4hAZJdE1sTek6FyW/W3VLXshNx5M0KcRSA6wb+TlZsWUWeEdhsme922VDRruCVX6UpDRl4ySiCFrbthDMbwDkvkNEDLyTUHbeDondy8eCzUaSG14Zc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=HueOHeQq; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=t+POq55Z; arc=none smtp.client-ip=64.147.123.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="HueOHeQq"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="t+POq55Z" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id 5EA0C1C000D0; Sun, 31 Mar 2024 09:50:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Mar 2024 09:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1711893048; x= 1711979448; bh=izQDdQ9YH09NT46uOT7yt+MDXit2Qa5tOUgaoIashhQ=; b=H ueOHeQquuMcR9BvenNaCrsxWiewh44J2HCqmTlZ/6wcVmqpOm8R4Q7AVdd8vm/cg vsU8a9jkH4JIfJFQfAwrDJ6P210RIU2O7Qcj8Z3hfA4+0490nikJj3HnMTlV6/2K Xv1uU+GXRS39CNiQRNaKeCtxKAYJY4Nydn4Pu0QhxBCd9QmBTZRCyXUcOTK+rsqC Q3+z86raVGtpKX8AEfuPDGiHoHWUy3Gm2J5/A0FKd0Gu7GjqMXwNmw7VTPxHJnjF UptSUMvmpgnWHQULwAQqKd/TpADQHcBfws2FONnqLSCdgMOlgPpvFUtRnghqr8kL cHMzpdm8bqtDJluL8XJLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711893048; x= 1711979448; bh=izQDdQ9YH09NT46uOT7yt+MDXit2Qa5tOUgaoIashhQ=; b=t +POq55Ztxx5RIzzNjesxwL0m9yNH70LyT1uUq+ujC2ZNsKa/80XOq0YMB6peIoEN yBj2nyBKPfI4xluYOFxqo/+I9xPG6oCAXmOJopbUl+iHCFtS8EH1Ja/KNQcgnTc+ lLe40HLpfGCorlzzv3pqFJydFlZR3Y9OfoimoPencF7x+vAGkkOOG8qoK/+rVMXV bmt309ZBLYOdTEqlINnldQkKzvwk2kN45I4HjbnyiYe8phK0acuw4+TgxNJQd9ZT GTLPDx0BBME32KbJeaMZ1PAY+KszV8DrauU6u/DXYssfdrag8iCyWmgxtmOqrnf5 UpOMhVaBA1TBQQBKaKGSQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Mar 2024 09:50:47 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/4] firewire: ohci: obsolete usage of deprecated API for MSI Date: Sun, 31 Mar 2024 22:50:36 +0900 Message-ID: <20240331135037.191479-4-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331135037.191479-1-o-takashi@sakamocchi.jp> References: <20240331135037.191479-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The usage of the pair of pci_enable_msi() and pci_disable_msi() is deprecated. This commit uses the preferred pair of API for the purpose. The call of pci_alloc_irq_vectors() can have a subeffect to change the return value of pci_dev_msi_enabled(). Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index ec02708c5f05..c14e6efaba36 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3623,7 +3623,7 @@ static int pci_probe(struct pci_dev *dev, struct fw_ohci *ohci; u32 bus_options, max_receive, link_speed, version; u64 guid; - int i, err; + int i, flags, err; size_t size; =20 if (dev->vendor =3D=3D PCI_VENDOR_ID_PINNACLE_SYSTEMS) { @@ -3748,8 +3748,13 @@ static int pci_probe(struct pci_dev *dev, guid =3D ((u64) reg_read(ohci, OHCI1394_GUIDHi) << 32) | reg_read(ohci, OHCI1394_GUIDLo); =20 + flags =3D PCI_IRQ_INTX; if (!(ohci->quirks & QUIRK_NO_MSI)) - pci_enable_msi(dev); + flags |=3D PCI_IRQ_MSI; + err =3D pci_alloc_irq_vectors(dev, 1, 1, flags); + if (err < 0) + return err; + err =3D request_threaded_irq(dev->irq, irq_handler, NULL, pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci); @@ -3776,7 +3781,7 @@ static int pci_probe(struct pci_dev *dev, fail_irq: free_irq(dev->irq, ohci); fail_msi: - pci_disable_msi(dev); + pci_free_irq_vectors(dev); =20 return err; } @@ -3804,7 +3809,7 @@ static void pci_remove(struct pci_dev *dev) software_reset(ohci); =20 free_irq(dev->irq, ohci); - pci_disable_msi(dev); + pci_free_irq_vectors(dev); =20 dev_notice(&dev->dev, "removing fw-ohci device\n"); } --=20 2.43.0 From nobody Mon Feb 9 18:23:02 2026 Received: from wfhigh5-smtp.messagingengine.com (wfhigh5-smtp.messagingengine.com [64.147.123.156]) (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 738D714535F for ; Sun, 31 Mar 2024 13:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893054; cv=none; b=VI5t6VUm7CCKn+BIwXv+l0qeRAk/rssB8GMRF26Sq0nwgdm80X8/s1oO8MHe9kHoSI4rPRClyGpAJBfJKkjyrFY+4ppYFqd+V14pMM7qdqZMvOiu9XrQb0DYnGjlyvOGTdBD6ccgd/yk/5770zQI65vm2tjetmoRO6YjdkOyO3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711893054; c=relaxed/simple; bh=Bm799p878xi8cCkGjfKPw5pJvYx9lsp1ujzntTHoG4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fsZ4ej7K8J0s3DzumCr2ILUCuhct5xQSYq2kUqOpyji/PYVzSrzmJ77b2A79UXpXgLzQ6XplHJxm2sxkoIDAK9eXmMHKrZoIfGTHEqyZz3tLhjtwpb/WQt4j+7o4aTama/ZNPTqyicXauEDfS74V5PbNq036SSvY6A6E4d/NjNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=ITPXHysp; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=P4Ervmmk; arc=none smtp.client-ip=64.147.123.156 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="ITPXHysp"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="P4Ervmmk" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.west.internal (Postfix) with ESMTP id 8867518000EF; Sun, 31 Mar 2024 09:50:51 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Mar 2024 09:50:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1711893051; x= 1711979451; bh=uOw+tg91pvfmeSLmBzCONKSxkv2GqAof7vSFCeSIuA4=; b=I TPXHysp+bNhFDtP00nyfPo+nL4VIjghkX1158R/Ts6LggcU0NmYyfEAC7A3bVpRh Abf81gWvU7MpzT+We7a/cfEuJwp5dYjV0uIb6z/I/ElZ+sIvc6bKRGa/lJQzanSf 5d+hYheRoLBNUnxhFbeFxyXR9W+gFxp82O8xuyyEO+U4drc84k6f5cUmKQ/qYNit lTM+4ANd0Gw3IMv1SJ9hbFIhtYPN7vmg8GhkcXTItNMJEvlajUADw6nVKtP1NbcP SZORAO5hwNx1wuW+n7y8SL+VrIqHNJFHq8uVpzNjQyxPGjA87B0Y/80Ch20bAInN tDjdnAZzZPp804QKZzG/g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711893051; x= 1711979451; bh=uOw+tg91pvfmeSLmBzCONKSxkv2GqAof7vSFCeSIuA4=; b=P 4Ervmmksa0SEV6ADejD5SPyKegJzR+dc3/jFAcF/F2y9fhyl9k7M07apaM2EvE7y CcFqRmXWTPbCbpo5kQTCaG8c2kdR3Igv9IhDmxKtjLVqjamekmB3X+io57OG4HvM ZmJq4xB2gzPeXRHPj3YuguBmEQAYLi1muLOSIlsbu0nJd37vh42Ann4mblmdtip9 azoG/YplDXB4y4Y02B9FTdOIwregSg7ah4Lyvhp08ZLGaa9BvIeulJQP2ngVNVZr hhu3U7pylPvAP+T1SyUh/QUW+VvwBVhoUByor3y1QW/SThO6BMXMF/TiRNgjspr6 2D+w/cDwyTAEBvFEUyrvg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Mar 2024 09:50:49 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 4/4] firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line Date: Sun, 31 Mar 2024 22:50:37 +0900 Message-ID: <20240331135037.191479-5-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331135037.191479-1-o-takashi@sakamocchi.jp> References: <20240331135037.191479-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The pci_irq_vector() is available to retrieve the allocated interrupt line instead of the direct access to the member of device structure. Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index c14e6efaba36..f3b610f86aac 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3623,7 +3623,7 @@ static int pci_probe(struct pci_dev *dev, struct fw_ohci *ohci; u32 bus_options, max_receive, link_speed, version; u64 guid; - int i, flags, err; + int i, flags, irq, err; size_t size; =20 if (dev->vendor =3D=3D PCI_VENDOR_ID_PINNACLE_SYSTEMS) { @@ -3754,12 +3754,17 @@ static int pci_probe(struct pci_dev *dev, err =3D pci_alloc_irq_vectors(dev, 1, 1, flags); if (err < 0) return err; + irq =3D pci_irq_vector(dev, 0); + if (irq < 0) { + err =3D irq; + goto fail_msi; + } =20 - err =3D request_threaded_irq(dev->irq, irq_handler, NULL, + err =3D request_threaded_irq(irq, irq_handler, NULL, pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci); if (err < 0) { - ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq); + ohci_err(ohci, "failed to allocate interrupt %d\n", irq); goto fail_msi; } =20 @@ -3779,7 +3784,7 @@ static int pci_probe(struct pci_dev *dev, return 0; =20 fail_irq: - free_irq(dev->irq, ohci); + free_irq(irq, ohci); fail_msi: pci_free_irq_vectors(dev); =20 @@ -3789,6 +3794,7 @@ static int pci_probe(struct pci_dev *dev, static void pci_remove(struct pci_dev *dev) { struct fw_ohci *ohci =3D pci_get_drvdata(dev); + int irq; =20 /* * If the removal is happening from the suspend state, LPS won't be @@ -3808,7 +3814,9 @@ static void pci_remove(struct pci_dev *dev) =20 software_reset(ohci); =20 - free_irq(dev->irq, ohci); + irq =3D pci_irq_vector(dev, 0); + if (irq >=3D 0) + free_irq(irq, ohci); pci_free_irq_vectors(dev); =20 dev_notice(&dev->dev, "removing fw-ohci device\n"); --=20 2.43.0