From nobody Fri Dec 19 20:15:29 2025 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 2E6372356A4; Fri, 25 Apr 2025 08:18:02 +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=1745569083; cv=none; b=oTzeddf2c00g4ns0eaXlBR7LZtGt8ESgfGMAlReKPCPNWffD3fUKRxsAFqATqz1S8CTO71J34XjFHDXNPkubrYQZAQXgshF9GWAjdDh65LDWlryzsF2T2PcNTfAxc5ij74hL88lLvrorpRI2uzuDuWGWYZSVlYYTFDvaqFTKPb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569083; c=relaxed/simple; bh=Q7F5o8AVhR4zCIu34F9b0xfiGNI6jZVtQ88rTFRCmfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IN4z5ZU8SEhGdY9GW6zeJsht+NlEjhEcMk0HCiTo0FHpfF3mEmRhOHq6IP+4/CzlntVHFg9yNXCxxxhPvBEb+6C2dvJie1mbQyE4k3LyGNFyJugUUqMqtp3ngUvdB5EB2nmohVDb9yMKAoZOoni3ZwBYHAB7SRtYgIaJJbiIV1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JmlmR3RU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JmlmR3RU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B722C4CEEA; Fri, 25 Apr 2025 08:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745569082; bh=Q7F5o8AVhR4zCIu34F9b0xfiGNI6jZVtQ88rTFRCmfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JmlmR3RUGsRb4c65c4O7IpQUXHZGK0oFAsFll/hEN2w7a+SHx3M2F64yLy5Ik2wOw xF+43QeV7spXkQkJZj9mq6CztDaa4oBclbHpSoBvEWH2jZ9f2XEDKUhrXYivmhxEEH ISGi1TkhXAIQ4CihiH5VMHgy2wgWBSKfS7yX3ZMBaviXgXy4jQcE+loTFWSizp7KFq reQvtVwgumwEmgdVNOttUCS5UmpNdw10EwsdMmUmg7R5BjYKLWKDqhiRVt/tMJ/O+n xs0UxSPfSaD7pKnFswy4kqBbucE1zm2tPWY/vAY+TgLIj4kowaYVMflK9fQnSBMR74 rHCjbZKZ/0fvQ== From: Philipp Stanner To: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Baluta , Philipp Stanner , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Damien Le Moal , Andy Shevchenko Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v3 2/4] ASoC: intel: avs: Use pure devres PCI Date: Fri, 25 Apr 2025 10:17:41 +0200 Message-ID: <20250425081742.61623-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425081742.61623-2-phasta@kernel.org> References: <20250425081742.61623-2-phasta@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: quoted-printable Content-Type: text/plain; charset="utf-8" pci_request_regions() is a hybrid function which becomes managed if pcim_enable_device() was called before. This hybrid nature is deprecated and should not be used anymore. Replace pci_request_regions() with the always-managed function pcim_request_all_regions(). Remove the goto jump to pci_release_regions(), since pcim_ functions clean up automatically. Signed-off-by: Philipp Stanner --- sound/soc/intel/avs/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 8fbf33e30dfc..8f15a65406cd 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -445,7 +445,7 @@ static int avs_pci_probe(struct pci_dev *pci, const str= uct pci_device_id *id) return ret; } =20 - ret =3D pci_request_regions(pci, "AVS HDAudio"); + ret =3D pcim_request_all_regions(pci, "AVS HDAudio"); if (ret < 0) return ret; =20 @@ -454,8 +454,7 @@ static int avs_pci_probe(struct pci_dev *pci, const str= uct pci_device_id *id) bus->remap_addr =3D pci_ioremap_bar(pci, 0); if (!bus->remap_addr) { dev_err(bus->dev, "ioremap error\n"); - ret =3D -ENXIO; - goto err_remap_bar0; + return -ENXIO; } =20 adev->dsp_ba =3D pci_ioremap_bar(pci, 4); @@ -512,8 +511,6 @@ static int avs_pci_probe(struct pci_dev *pci, const str= uct pci_device_id *id) iounmap(adev->dsp_ba); err_remap_bar4: iounmap(bus->remap_addr); -err_remap_bar0: - pci_release_regions(pci); return ret; } =20 @@ -584,7 +581,6 @@ static void avs_pci_remove(struct pci_dev *pci) pci_free_irq_vectors(pci); iounmap(bus->remap_addr); iounmap(adev->dsp_ba); - pci_release_regions(pci); =20 /* Firmware is not needed anymore */ avs_release_firmwares(adev); --=20 2.48.1