From patchwork Fri Apr 4 12:19:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038395 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 7A6A019AD48; Fri, 4 Apr 2025 12:19:41 +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=1743769183; cv=none; b=fJ+kYpRKAoYYpeul3dEecMRSR0y/aSnXF7niQP4F9oE097FiGbs3r7NXTOUeTQbJxZp21mWIg5Q/YFmDo6VTVIOONP7XvwmA3o0ROtScEJGbqAJZH8sxqe5s1uloR7cr+CFhH2c4VWW5r+5dct+HMHEfzHqiSu+qxojEtE3Do0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769183; c=relaxed/simple; bh=6EyrOB3NDM1VBqOcneGBh0mEfK+tyesdMZnkwt2FIe0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E/DT3k8gB0u1vUoyh/nXXG9CW4RzMLwU4+jAO6ouhu8eXsaNW/RONOsyBhIA20SmH2TVGJqTEJrQmhGsPiuw23Q+8VgWzhfoLHsdfe+xG/C60Vh+JCwPt1xf1Ti0NWF/lOOANWCmsul/Iy9tWQNHRJ7wbZAb/qVikeeF7KkkeOA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lHgIw6K6; 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="lHgIw6K6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74C54C4CEEB; Fri, 4 Apr 2025 12:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769180; bh=6EyrOB3NDM1VBqOcneGBh0mEfK+tyesdMZnkwt2FIe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHgIw6K6ygGoKTDPN1RyQjMAotnvnfcrg1Qk1w22LG5TiuCy+bHC3uoYYwgiIlEqK ezt+hjk5oxLYnSdCCWXGyvLb5n7kOAky6D3XOPWz57cA/zATrZKTFnyjxXmAvS2u3o rvi7KI5NaRktwIrwRP+vJfw8RRAGqlIyz8YmDKcWG8DYB8d5AA44YZ2qhuGapBsYkN M0DeR51AFhiedEsrZaaJdwyioe+/m0R7pbB8AxL/r6agGBQftfM1MjfyAUPqFc79g4 F6H3L4F29nYP7CL+Keivx3T1Tt812US/jveoz3i+sRCfb2oUzPx8rDAeXZdpf9K3ts +iVAB2Z1vgiEA== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] ALSA: ad1889: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:02 +0200 Message-ID: <20250404121911.85277-3-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/ad1889.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 9ed778b6b03c..ac27a93ce4ff 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -810,12 +810,11 @@ snd_ad1889_create(struct snd_card *card, struct pci_dev *pci) chip->irq = -1; /* (1) PCI resource allocation */ - err = pcim_iomap_regions(pci, 1 << 0, card->driver); - if (err < 0) - return err; + chip->iobase = pcim_iomap_region(pci, 0, card->driver); + if (IS_ERR(chip->iobase)) + return PTR_ERR(chip->iobase); chip->bar = pci_resource_start(pci, 0); - chip->iobase = pcim_iomap_table(pci)[0]; pci_set_master(pci); From patchwork Fri Apr 4 12:19:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038396 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 809EF1E8351; Fri, 4 Apr 2025 12:19:46 +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=1743769186; cv=none; b=D1MMRLXyMFtmELRff5EmFTlqekUniyxXudn6VMZEH2febsD7forQV3xvhAx9Ey6abODBzGg3NuS/vHfPC3EviKUz+xIGWxh0X2J29hesYA87BZoJcYawzORyWBVECrFet3e/GtUtowBc1icBcS9jsrtimhmzinCBqqk2/heyssg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769186; c=relaxed/simple; bh=A3xq0rUAdIUU549lnKoePK2QZqGdBsCq6aI5d3tcGBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MEViPzampN+CURDqE+J9bRd+yrUmA/H2hh9G9BAQE10hbJahJJojy5hTEPOdRQIJBSxbdZIASCHlMC7x7Oh2PLs3gxfa+lQhZ6bz9iVX18ucm6eIL3FajYFZ/fKMn92u9FVqr/H1O3STCdzFaLHzzy00gUlRMX+ryHTy4J5DTdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d4yOYpua; 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="d4yOYpua" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74B47C4CEDD; Fri, 4 Apr 2025 12:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769186; bh=A3xq0rUAdIUU549lnKoePK2QZqGdBsCq6aI5d3tcGBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d4yOYpuaDHzeRLOfczZuQ23hmsy0R+6J6/zGgUr4QQWb34f3xBLwHuCN+s79XDmd2 GI1Rhr9O6OQBPPFNJeVa6nmq+S50+zmkVtDZ41ZdxyxSdanEoaUwKJa41Ng2mrvSwJ vEe7DBFl50KgvXlm3Fn1+ibve5xzkh/l5sVZDueEtM0PePXX2GsqeZdbqHpEeSEb1c CKixwd479MZLo3pemPMdhLlYtwzQB7GVH5q15WBD/5jRKg//LnkBWIc3ZbPvUmcoWh RQzH0Vdzizk1OTAlSO7XO9E5By30vYR0HmHSpkRSU/hwXTyXUY70oxNeXQ5irikQLc HatWhyeX7gV5g== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] ALSA: atiixp: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:03 +0200 Message-ID: <20250404121911.85277-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/atiixp.c | 7 +++---- sound/pci/atiixp_modem.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index df2fef726d60..427006be240b 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -1544,11 +1544,10 @@ static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci) chip->card = card; chip->pci = pci; chip->irq = -1; - err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP AC97"); - if (err < 0) - return err; + chip->remap_addr = pcim_iomap_region(pci, 0, "ATI IXP AC97"); + if (IS_ERR(chip->remap_addr)) + return PTR_ERR(chip->remap_addr); chip->addr = pci_resource_start(pci, 0); - chip->remap_addr = pcim_iomap_table(pci)[0]; if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index eb569539f322..8d3083b9b024 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c @@ -1174,11 +1174,10 @@ static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci) chip->card = card; chip->pci = pci; chip->irq = -1; - err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP MC97"); - if (err < 0) - return err; + chip->remap_addr = pcim_iomap_region(pci, 0, "ATI IXP MC97"); + if (IS_ERR(chip->remap_addr)) + return PTR_ERR(chip->remap_addr); chip->addr = pci_resource_start(pci, 0); - chip->remap_addr = pcim_iomap_table(pci)[0]; if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { From patchwork Fri Apr 4 12:19:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038397 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 7DF101D63C6; Fri, 4 Apr 2025 12:19:51 +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=1743769191; cv=none; b=h2KP6LS8ZCrZMzcSgL9TkhXyVimVmlSMhN0pq33/guF2bU46TxUej+t9Wqt1Bpdzb8RYhmeNBgTSDyK81NxXOc2yx7SKpCBGTqg206aaQJpDy6gFoluJ4K8FdrQcIFM4pG0gK9gqGMdwCAvSB5GNj9VK1hTguEmSYJDgXJBkPeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769191; c=relaxed/simple; bh=UR3ylbPrlD4cM/qSwpFRclhvsbIYwavOMBZoW3VPel4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LJjlmreCzujSYar3vgC5DYaldANVBGdnrTxINRILUi6dgOpGC9Mk01dCwGBt99BQRtYErvbXPv6wOE73zR5ClTnylibHZTvRIYLP03UC+M1BzeicQJPsDxrDh8hgFRDKn6XYdduYiDkV4iimJoNLUsf6XUXdYjWvt46zgJh0/GQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fE4wENMc; 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="fE4wENMc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DE49C4CEE8; Fri, 4 Apr 2025 12:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769191; bh=UR3ylbPrlD4cM/qSwpFRclhvsbIYwavOMBZoW3VPel4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fE4wENMcITVzxCH75HC/qLpduG1fCJWwgUga+WxnK112Nbj5RfNoA+aXxOXjx2uSq N+LMD//9RfrL6ddt3Da5k76Y/OIc0IgoZeXyhhgWh4Vkf2PRO/dSpbQfzGWUby/Kpi v4+ETEbuDHeQI/Dw7FERe4UEego/iMUr/YPETAFR6p8KfGPoitZNCPT14D188LYprV bqNh733zvfXMOmiO8tZemYf0OOBol8sDTOm+jU7i6EvDkf3ilUke72tjrzZzz21RnI DLpxBH4R0TNAdaIRWMia2WWXnI5+zv2ar/JuAyraRqHEkPdJop7b9mfBna4LNSj60/ CGYh4p66LGw+Q== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] ALSA: au88x0: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:04 +0200 Message-ID: <20250404121911.85277-5-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Additionally, the "name" parameter of pcim_iomap_region() should reflect the driver's, not the hardware's, name. Pass the correct parameter. Signed-off-by: Philipp Stanner --- sound/pci/au88x0/au88x0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 62b10b0e07b1..fd986247331a 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c @@ -160,12 +160,11 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci) // (1) PCI resource allocation // Get MMIO area // - err = pcim_iomap_regions(pci, 1 << 0, CARD_NAME_SHORT); - if (err) - return err; + chip->mmio = pcim_iomap_region(pci, 0, KBUILD_MODNAME); + if (IS_ERR(chip->mmio)) + return PTR_ERR(chip->mmio); chip->io = pci_resource_start(pci, 0); - chip->mmio = pcim_iomap_table(pci)[0]; /* Init audio core. * This must be done before we do request_irq otherwise we can get spurious From patchwork Fri Apr 4 12:19:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038398 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 7C21A1E5208; Fri, 4 Apr 2025 12:19:56 +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=1743769196; cv=none; b=lacn9eLW3RsWJ4nEGtWRFC/Wc0S87CtbGenWFmZkCyAIFB/VSnNkdO+3prNooN+wdyHlkMdWIl9hgzqhcNwf/x8YJv6Mv3iXCmAytIqFXOLwUyw8NcsxsvUzQvRBFNVpJyyz/M3nDuO187Os9ZxRHEHKyP7YROY2/lwZumEmWkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769196; c=relaxed/simple; bh=5MtsGFO1uLYdoKplUaByypeIPvxuioAjCAgT39QIDJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DtlDBvZm1MXA+A/IOvtluwIlBce9YawsTcIiV/sj+r3tkbcZTeGttRxLaYeY8w0hKuRua3wMAoCgpntuFlMOyQv4wIkHT+FCCfosWzVwFlIOlOyi6T0+6p/QlO/7pJ8a0Tpr5u1Ega8J2W6k1lt1zFCDF0mJktM5yO/P59nT5ZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CXUTh9WY; 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="CXUTh9WY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73163C4CEDD; Fri, 4 Apr 2025 12:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769196; bh=5MtsGFO1uLYdoKplUaByypeIPvxuioAjCAgT39QIDJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CXUTh9WYJifgQXv7zWNhKpI3sFIMk/uyhAXiMegQnEzYeuS/f1MpzWHwfx0MWs38C nm5bAF/l1vO8D3x/16Hv/sEpNvYKzKnQAEfllV5OeEzYT9zTeuIvoETuutN/GRHGMv hUdyktg/xb/2G0YVtfH+S+v3r3s720/5P9QOvTVeN0Hx6e5eP7uUwW0jcNkVWhGhx0 GafMrSb39ijZO3fPWTK5Lok/hB+S7XyQTTcsXUpHoG9rTLZp5Z1KmHljEBgWdjJKy8 /GfDnWfXO+fRs+S28Kridzqbg49NIC3KrmAORXoVQsdI75egDkNSFKXhsbt4ljbEC1 EqCMYl6mefWFA== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] ALSA: aw2: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:05 +0200 Message-ID: <20250404121911.85277-6-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/aw2/aw2-alsa.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 29a4bcdec237..7b4b8f785517 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -225,11 +225,10 @@ static int snd_aw2_create(struct snd_card *card, chip->irq = -1; /* (1) PCI resource allocation */ - err = pcim_iomap_regions(pci, 1 << 0, "Audiowerk2"); - if (err < 0) - return err; + chip->iobase_virt = pcim_iomap_region(pci, 0, "Audiowerk2"); + if (IS_ERR(chip->iobase_virt)) + return PTR_ERR(chip->iobase_virt); chip->iobase_phys = pci_resource_start(pci, 0); - chip->iobase_virt = pcim_iomap_table(pci)[0]; /* (2) initialization of the chip hardware */ snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); From patchwork Fri Apr 4 12:19:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038399 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 7ED791E1DE2; Fri, 4 Apr 2025 12:20:01 +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=1743769201; cv=none; b=DXt8ivO3a97TQPjOG2/XlGxUaa/xUfVA5fCOukV3XSvnoNtl1tlZzGrXypnkj3488OK0hH4VA6y4Zbdk0IcNw8VmMD6t5fc1pbenWgwCUdqkO9qxTcQyqYXozFHWY1keiVnF4wO4z5v21A08xpVrMGsnLk7P3bdyDbhz7WZLQFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769201; c=relaxed/simple; bh=fbXea3Shj3guiflysHMHcCIqhdLN2+X5cOpXRldk+4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f+KjR6vUEq6lBfH5SrEK7MSfZTxZUwqAe3sKOyfwawA+mkXL+R55VDpThjTOIh9OC+t6RkvBC7CMHdzMO53tJohMHZ6Dxb0fh5pwAculH7a6XQmv0hBg88iVRjU3WtE693rb/toX5nz1QXnsIIwBRt7M05MA1xO14goYYIG3nGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tn0Ct4Mu; 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="Tn0Ct4Mu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86529C4CEE8; Fri, 4 Apr 2025 12:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769201; bh=fbXea3Shj3guiflysHMHcCIqhdLN2+X5cOpXRldk+4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tn0Ct4Muok+HTFcxJ+vpAgclnXQQD+YjBZK9C4pXL0GUA4UD0b/jUN8r5wahRpmAO xfnrRWHHf7Az1CtmKWQYlgjIpOAlEfcMH1+OlC48zKqIpB9ApTFHx783IhqmSRRyq3 QegUvSfB7pDA9YHGZ9Jw40rNL5qh7UB03ltoadRaYnAAKkw/qdleQJCDPObdW1GL0N oLXXHH6sXvn0S/o/W0Ykm+uWbYbaprRbsM0LW4m87/qvcZLyIsGAFDjASCZFUT4U/+ pJFXccfOotlltD/hwUkRshKCVsnr4MxZZ2E19ag1HAcT3SjCW0UB2esvKJL/RTcAZd 5EAfFw2jC5ing== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] ALSA: bt87x: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:06 +0200 Message-ID: <20250404121911.85277-7-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/bt87x.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 621985bfee5d..91492dd2b38a 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -696,10 +696,9 @@ static int snd_bt87x_create(struct snd_card *card, chip->irq = -1; spin_lock_init(&chip->reg_lock); - err = pcim_iomap_regions(pci, 1 << 0, "Bt87x audio"); - if (err < 0) - return err; - chip->mmio = pcim_iomap_table(pci)[0]; + chip->mmio = pcim_iomap_region(pci, 0, "Bt87x audio"); + if (IS_ERR(chip->mmio)) + return PTR_ERR(chip->mmio); chip->reg_control = CTL_A_PWRDN | CTL_DA_ES2 | CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT); From patchwork Fri Apr 4 12:19:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038400 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 031F71E1DE2; Fri, 4 Apr 2025 12:20:05 +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=1743769206; cv=none; b=lKOy21HeIMXZRqWzD/stwAlYs07pKDoBlkhsra8sB1IkpPTT/1jGEUkG87OpIRh+sc8JNnFngGY/p0A+IKszL9UdtrMcZslFfkeYp1NBdYOpHGmfD0+QXDotklBRFrY0p+XsMjrHA+DPhreCb+Y5GIfaQnJFeZdpcDVlpN9ZNyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769206; c=relaxed/simple; bh=ndrksRo2ox0HIaNBeEqWGrf6BJJ+FtpPlqysCXniRm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6lViCo6CRL7gLURVi/MTI5cYCjNBLyv8urLNSNlz00si0HLOTzvV56k792eVaLL+PuHe6kn/RsLhj2rjtWb/0+3WRxOduOvTIL/XLaIyJHzHbruTFSL6PDr+oFMRN+EU4q6KL9GBuVEf5CP+PyXo2BMT711f/Q1CbD/MiSOoFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C2LdLJOt; 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="C2LdLJOt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71A3CC4CEE9; Fri, 4 Apr 2025 12:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769205; bh=ndrksRo2ox0HIaNBeEqWGrf6BJJ+FtpPlqysCXniRm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2LdLJOtuE/yG6JZukzaOejnSfSeFdlVTsF0lMWkSoGYivNhxs5a4bVXY1/VabsBJ 69gX8Rz/KDGBZK7t31tOP79WTVcObwB88lSXNulIeAlDcVTVjTYu/ONWbbmxOAhM2i LrZXIdXbIZLHidbUyq8PIepxZpnnBqWRHalaeqn9nrc+/anvIIqBQ7tsrp+1+lAwty 27hVl18JoLbRMgC3ybGWNX3IHbyEFUHcZspWjRJ7hz5TBd/QPtFMZ/bDOkEl78/ekF qIBAJdcogeOhUYv8LYmUHoQMKnb8YtAWOXNCWWGqhulINjQDQyD+3zdeVBVxvQrrw1 KIDrz06DZTUmA== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] ALSA: cs4281: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:07 +0200 Message-ID: <20250404121911.85277-8-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/cs4281.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 0cc86e73cc62..90958a422b75 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1302,14 +1302,15 @@ static int snd_cs4281_create(struct snd_card *card, } chip->dual_codec = dual_codec; - err = pcim_iomap_regions(pci, 0x03, "CS4281"); /* 2 BARs */ - if (err < 0) - return err; + chip->ba0 = pcim_iomap_region(pci, 0, "CS4281"); + if (IS_ERR(chip->ba0)) + return PTR_ERR(chip->ba0); chip->ba0_addr = pci_resource_start(pci, 0); - chip->ba1_addr = pci_resource_start(pci, 1); - chip->ba0 = pcim_iomap_table(pci)[0]; - chip->ba1 = pcim_iomap_table(pci)[1]; + chip->ba1 = pcim_iomap_region(pci, 1, "CS4281"); + if (IS_ERR(chip->ba1)) + return PTR_ERR(chip->ba1); + chip->ba1_addr = pci_resource_start(pci, 1); if (devm_request_irq(&pci->dev, pci->irq, snd_cs4281_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { From patchwork Fri Apr 4 12:19:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038401 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 7F5161E1E0B; Fri, 4 Apr 2025 12:20:11 +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=1743769211; cv=none; b=Y/mQDg8ZRUWleBqt3Z7E9P5D98THo5URWy5nIyPQDscIXBeyrwam3sDHybzA+mNqlX7sHePQwsUMDvKjdGnG9tRwTJmorXqP24cF1OXuJh+on+AFWdxNdnDjjIIq7qJiIDguwS9RnlXLAjLLWlc26fC4PxKgZNmdwgK6hnrDirk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769211; c=relaxed/simple; bh=Eqsmusvff21LEc4e+xTapm1qlONThwACIGwwNzzDYes=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gYaHWcDUgkrszSoHgkI6J437FfLyDeGZ+G3HO07IxhUqKblcYbJXTSdnpsqn9N6a07zY+7/+LzKS9tF8YKz47A+b4x7N0Rc0CjZG+lq6n4tUSv9gKh1coIPtYpDeQEwiqPJYMRG2QV3tO/K596WC4PIKZyvMXjfKIKLRtI72EcQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kES0BanV; 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="kES0BanV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D95CC4CEDD; Fri, 4 Apr 2025 12:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769210; bh=Eqsmusvff21LEc4e+xTapm1qlONThwACIGwwNzzDYes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kES0BanVXI+MEEwo3ykIbIUejtytVP+oqUaQDOmX3XowootcdlcdF49rhdrK5NlLh CVS8HBTCYumvUf3xy70KiTpvK1kzakjGbB1UWYfwAF6BKbE4nv9x3Qs+/bp3dN8FlR CG1Rg0oFIn6lRIVYzWjahPz5bz/gwMvRoCQtlE4Jf6UnCGqBbu9v4q764qubZfsztZ 3yppmSBpT3HsBLFAmRQ68H1gMu4I2xkJIJNJRj6ADdrFXHfyE1eoMFxCjTjoeWcV31 kSJBweQBzyrx+E1oTwPM5fUt4RClHC7OGzSK6qRaj83tbej/di3qhAWFduxH4pbcVG s58jJiyOthozQ== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] ALSA: hda_intel: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:08 +0200 Message-ID: <20250404121911.85277-9-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/hda/hda_intel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 512fb22f5e5e..9756017930b5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1877,12 +1877,11 @@ static int azx_first_init(struct azx *chip) chip->jackpoll_interval = msecs_to_jiffies(1500); } - err = pcim_iomap_regions(pci, 1 << 0, "ICH HD audio"); - if (err < 0) - return err; + bus->remap_addr = pcim_iomap_region(pci, 0, "ICH HD audio"); + if (IS_ERR(bus->remap_addr)) + return PTR_ERR(bus->remap_addr); bus->addr = pci_resource_start(pci, 0); - bus->remap_addr = pcim_iomap_table(pci)[0]; if (chip->driver_type == AZX_DRIVER_SKL) snd_hdac_bus_parse_capabilities(bus); From patchwork Fri Apr 4 12:19:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038402 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 88C501DB363; Fri, 4 Apr 2025 12:20:16 +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=1743769217; cv=none; b=rO9K5p01cJk7ZAiOwqOcd9fTwqE7p0YZAfyxU9LSm7iCqzd9DgaKVtL7aIEBCHkXwBQeYGieHoXGTkkCg9Wjf6BuZLbUtA3CrLIpdJ/fH+nq7eGHqHD98N8nuev2DLG6wU8Ks2ECwDIu+c9IM1pWC/SdYPOX0kedH4Ah4ogZutk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769217; c=relaxed/simple; bh=9KeLJD7hn/Cvu1GycH77pEkfx5NqVTboX7GrRF9VRkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=saaJt2z1j44Z3FZwDKKry2mQkAj59oEI3R4m4o0+dyH21mSEOn7ZF790a7IQ9rkaNXVwZLG8h82/jxQ3okEaDn30aBsQZuiS7+9201b749664hcfGx0nl6dvAD71zgeWWvVXgmEKBBnKlls/w5TGFeJNiCN9BdkPRh8muTpvej0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NCj84H31; 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="NCj84H31" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73097C4CEE9; Fri, 4 Apr 2025 12:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769215; bh=9KeLJD7hn/Cvu1GycH77pEkfx5NqVTboX7GrRF9VRkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NCj84H31pCom1IUCddDmd5M7mJn26KIuWe3KCQKt+WqZIa0gtxIi7gyz5T6vs28Aa 0AGFYhif+ci3/NtlETiSo1nciHq4fCB0oMkuNuWk/os0jeRL38fm1ouL+r5KBWQXq+ 77TjMM2UsgLELBfJqjGruO6LvUOlQ8owpVDi248DCnvmqqhKnBewuuCalrHZk9CnaZ uTCvDXlt3WQ2ZUZnAdBXzluYzdoihllkSCryOHNFrqBMHvY9kDAM3Y40jfexOTDYir sx6ilzD33hSZ3SZ+LsSmSWS+W6x++5qry4aTTA3lJloAQuuR7GOkD1EFbaj7LjL8GT Kwipuh7U7Msiw== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] ALSA: cs5530: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:09 +0200 Message-ID: <20250404121911.85277-10-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/cs5530.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 93ff029e6583..532891e67c34 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -91,11 +91,10 @@ static int snd_cs5530_create(struct snd_card *card, chip->card = card; chip->pci = pci; - err = pcim_iomap_regions(pci, 1 << 0, "CS5530"); - if (err < 0) - return err; + mem = pcim_iomap_region(pci, 0, "CS5530"); + if (IS_ERR(mem)) + return PTR_ERR(mem); chip->pci_base = pci_resource_start(pci, 0); - mem = pcim_iomap_table(pci)[0]; map = readw(mem + 0x18); /* Map bits From patchwork Fri Apr 4 12:19:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038403 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 67C8C1DB363; Fri, 4 Apr 2025 12:20:21 +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=1743769221; cv=none; b=fycUoyCJpF4h6Pkf27vccImw8YVCUtOZh4UI35KE5gj7697E9H9eOC/SNs42VCeUOk0AXFx/VqcOrW4BkMFemYlbKnCja2isnZ5In+G3ukr3OuPyzVacjffcrjzD7F07jYjGvowZ2dvChcFnLlOE53ohJxaw4keDmZaaV5VcOSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769221; c=relaxed/simple; bh=U3zc9rq5pOtG91hVcTj9KfcFGn45wA/PUYfioMJ8Z5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JesB393t+PMKkHGcMU4cRbWxFgmG/OqBaYN0Q7wpXgU1Nu4H9a7eXbhAWFY7g9ovgCLkXa/z84b8FvdVTxYQYFZEgO3MK93SKPk2HX45jHvp2atUzkfld+0ObtDtzWt2DZbe/wAfoJANANa7E4pQJkzYFJeieXQVbV2O3sEh3rc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uzzw0M1N; 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="uzzw0M1N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 654E3C4CEDD; Fri, 4 Apr 2025 12:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769220; bh=U3zc9rq5pOtG91hVcTj9KfcFGn45wA/PUYfioMJ8Z5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uzzw0M1NUKuYFC2zKR28bX/AUW4T9+8vnjzHkRNBj585r+lkrU4x+pxl+InrCuMTn b03wVpREaaYZDZnDySvijkGxyS9hpekq3lCUSbXdFVHXB8QUEv0CmevA8JC1QU6pTr MpUZ7k9r8BSkYWZGRBrkF7bPvLsIak9+RfIClp8hLv33OSioJTjwwU5o0g5UkLRk+z MadOvH3pI1FpiL9KuKjJlCS5N8kNZlRPmClPvq2gXEEa9+qIPliROqDoFI9NMOMUe0 /UvE7vpzKumbed/ATZV4URqMdsnCUGqjUHDVWS2+aGPqMmzo0mRsNHVpT6ev1S9MlG xHSCBFHdIUD8Q== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] ALSA: lola: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:10 +0200 Message-ID: <20250404121911.85277-11-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/lola/lola.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 1aa30e90b86a..fb8bd54e4c2d 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c @@ -541,6 +541,7 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev) struct lola *chip = card->private_data; int err; unsigned int dever; + void __iomem *iomem; err = pcim_enable_device(pci); if (err < 0) @@ -580,14 +581,19 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev) chip->sample_rate_min = 16000; } - err = pcim_iomap_regions(pci, (1 << 0) | (1 << 2), DRVNAME); - if (err < 0) - return err; + iomem = pcim_iomap_region(pci, 0, DRVNAME); + if (IS_ERR(iomem)) + return PTR_ERR(iomem); + chip->bar[0].remap_addr = iomem; chip->bar[0].addr = pci_resource_start(pci, 0); - chip->bar[0].remap_addr = pcim_iomap_table(pci)[0]; + + iomem = pcim_iomap_region(pci, 2, DRVNAME); + if (IS_ERR(iomem)) + return PTR_ERR(iomem); + + chip->bar[1].remap_addr = iomem; chip->bar[1].addr = pci_resource_start(pci, 2); - chip->bar[1].remap_addr = pcim_iomap_table(pci)[2]; pci_set_master(pci); From patchwork Fri Apr 4 12:19:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038404 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 128101EBFE2; Fri, 4 Apr 2025 12:20:26 +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=1743769226; cv=none; b=DTz9RFbEQOQBaJbeyTfDZcSEtBCsx0yt+4AK/+aJ+KtBLn7MWST0M12ZOVb7fUldrMsLAGABaR3pFm8Hy1fy8dmJtXHRGONptRQC8RZ6ZKyXEok7pUJyFjQ0phVsaEHZVnl+VxQMjzFK3oO1SxQqJr2RzHzx2ZL4wLG/9jyEebI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769226; c=relaxed/simple; bh=s+giwPaT/Tv9s/df4azVB4o/cHwapfcHYHXBslVCdOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bx/CBEnsoHfBVPuxRsZzXFGoXKLtLt9Fcnk+6lDGjaKweihPJXzfhg3pyQUuZbIfLI46LV43FZINGka36vi41Q1bErfrZVW15MDeP3FSOLyMeRYIdtuE0UWSPrhQTFfo8yFv4SR8Hm+vX429Efcc8vbzX3r0f4SrKQ0PFXICSUw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DZIHhL+w; 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="DZIHhL+w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 699C4C4CEE8; Fri, 4 Apr 2025 12:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769225; bh=s+giwPaT/Tv9s/df4azVB4o/cHwapfcHYHXBslVCdOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DZIHhL+wJKM35i0cwXBtvcIJv3nqbcBfNFsdbO5hQCEpwTuA2Spk2AYqqHG5bfiTG ixRIbd9VS/djCN2RpMI4pol4eM88FZxbV4Sm659k+E1IsGYIldPmi+W+ZO2k/goAJ3 qQVoEmEIXCj8+OSFELVUgW8yukYDv7c9pzlkdawTlG9+deXT4Q1MWC7IYASmeco07h grFkmXddflaJbzQXl5TFwIkZqCQa+kbOMCwoQmzS3s0eLARjjXpEpXPzzZthY1C7D3 sFXb4c9LTuiX1Eendh9WdJ79KRHovPKAvI9ia2ToElrZ8Y5pyw7ocRKV/rzdJMboxC 4PtzEkoBQtvzQ== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] ALSA: hdspm: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:11 +0200 Message-ID: <20250404121911.85277-12-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/pci/rme9652/hdspm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index f89718b19d23..9e11e60284eb 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -6558,13 +6558,12 @@ static int snd_hdspm_create(struct snd_card *card, pci_set_master(hdspm->pci); - err = pcim_iomap_regions(pci, 1 << 0, "hdspm"); - if (err < 0) - return err; + hdspm->iobase = pcim_iomap_region(pci, 0, "hdspm"); + if (IS_ERR(hdspm->iobase)) + return PTR_ERR(hdspm->iobase); hdspm->port = pci_resource_start(pci, 0); io_extent = pci_resource_len(pci, 0); - hdspm->iobase = pcim_iomap_table(pci)[0]; dev_dbg(card->dev, "remapped region (0x%lx) 0x%lx-0x%lx\n", (unsigned long)hdspm->iobase, hdspm->port, hdspm->port + io_extent - 1); From patchwork Fri Apr 4 12:19:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 14038405 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 74B411EEA33; Fri, 4 Apr 2025 12:20:31 +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=1743769231; cv=none; b=fEdzHXmIl50bMQjH44tXP/OQw5B5j3uGLqLAs6MOYA0Eq+PUtDRbOB4JGNiE4dwtVF8WYsX6klBzwh34k5xLgyCXW7SVKoeCtrFLCA0h7+wTrjKxLYeuHMGL4iQcHHQeHJbfkTiktmhFxXTLQfbfJWlYX38vLgNjFrSygQ8Wq+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743769231; c=relaxed/simple; bh=hB8g06LHusju5aaSslcMI2Vmp9YyRR3BB0OcFs0BMkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lX8s78g51Z3xUjNL3/NRnRjZ67XzepsRCEIjVCeB6AWLNEeOw0faznx3oYBXWcoTj8gNs85Cvisb15XMoLCB1N2N43gD/OqZLpzkKTd3QT0AoIOzebj59mABtreqL/e6u9aqVze0Yj1dNCZK0jOpDLfYjyOCyRBnJW411ZRcCv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DjbdX148; 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="DjbdX148" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DC5EC4CEDD; Fri, 4 Apr 2025 12:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743769230; bh=hB8g06LHusju5aaSslcMI2Vmp9YyRR3BB0OcFs0BMkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DjbdX148Bl2eCI6bf9kX4v8EgXT2tJ/yA43dmcUsRp2j2MTp0ZWsbT81X8KknAZG6 KgQrvt3K5im/Dtygesji+p5dRphOhfSkQDCjpHO3ou4DjKa0AL8N6OurJIr2jJgzNJ yAakodZl6QDHLqn1x6RfwV34+1Pc0eV8/Wri5haHvowd+zf1kg0Q4x/Aojs390SffF pSM9AeR6ljvsk/0DQZ/TkkrX6s8BwWwWj3L8+WaUNxTK1TD1kYG2V2jrsIYEStKhp+ qixweR2Kxz9Q+eSArQ6h7kaStsTSKPHtkbhB8DgtngEtGuMe0hIHpslFghf5B4t60l bYGEiugosak/Q== From: Philipp Stanner To: Jaroslav Kysela , Takashi Iwai , Clemens Ladisch , Liam Girdwood , Mark Brown , Thorsten Blum , Philipp Stanner , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Heiner Kallweit , Maxim Mikityanskiy , Kuninori Morimoto , He Lugang , Jerome Brunet , Binbin Zhou , Tang Bin Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] ASoC: loongson: Replace deprecated PCI functions Date: Fri, 4 Apr 2025 14:19:12 +0200 Message-ID: <20250404121911.85277-13-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250404121911.85277-2-phasta@kernel.org> References: <20250404121911.85277-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_iomap_regions() have been deprecated. Replace them with pcim_iomap_region(). Signed-off-by: Philipp Stanner --- sound/soc/loongson/loongson_i2s_pci.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/loongson/loongson_i2s_pci.c b/sound/soc/loongson/loongson_i2s_pci.c index d2d0e5d8cac9..1ea5501a97f8 100644 --- a/sound/soc/loongson/loongson_i2s_pci.c +++ b/sound/soc/loongson/loongson_i2s_pci.c @@ -16,6 +16,8 @@ #include "loongson_i2s.h" #include "loongson_dma.h" +#define DRIVER_NAME "loongson-i2s-pci" + static bool loongson_i2s_wr_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -92,13 +94,12 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev, i2s->dev = dev; pci_set_drvdata(pdev, i2s); - ret = pcim_iomap_regions(pdev, 1 << 0, dev_name(dev)); - if (ret < 0) { - dev_err(dev, "iomap_regions failed\n"); - return ret; + i2s->reg_base = pcim_iomap_region(pdev, 0, DRIVER_NAME); + if (IS_ERR(i2s->reg_base)) { + dev_err(dev, "iomap_region failed\n"); + return PTR_ERR(i2s->reg_base); } - i2s->reg_base = pcim_iomap_table(pdev)[0]; i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base, &loongson_i2s_regmap_config); if (IS_ERR(i2s->regmap)) @@ -147,7 +148,7 @@ static const struct pci_device_id loongson_i2s_ids[] = { MODULE_DEVICE_TABLE(pci, loongson_i2s_ids); static struct pci_driver loongson_i2s_driver = { - .name = "loongson-i2s-pci", + .name = DRIVER_NAME, .id_table = loongson_i2s_ids, .probe = loongson_i2s_pci_probe, .driver = {