public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] counter: intel-qep: Replace deprecated PCI functions
@ 2024-10-28  9:13 Philipp Stanner
  2024-11-01  6:04 ` William Breathitt Gray
  2024-11-01 13:12 ` Jarkko Nikula
  0 siblings, 2 replies; 3+ messages in thread
From: Philipp Stanner @ 2024-10-28  9:13 UTC (permalink / raw)
  To: Jarkko Nikula, William Breathitt Gray
  Cc: linux-iio, linux-kernel, Philipp Stanner

pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()").

Replace these functions with pcim_iomap_region().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
---
 drivers/counter/intel-qep.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/counter/intel-qep.c b/drivers/counter/intel-qep.c
index af5942e66f7d..ee2bae27b728 100644
--- a/drivers/counter/intel-qep.c
+++ b/drivers/counter/intel-qep.c
@@ -408,13 +408,9 @@ static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
 
 	pci_set_master(pci);
 
-	ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci));
-	if (ret)
-		return ret;
-
-	regs = pcim_iomap_table(pci)[0];
-	if (!regs)
-		return -ENOMEM;
+	regs = pcim_iomap_region(pci, 0, pci_name(pci));
+	if (IS_ERR(regs))
+		return PTR_ERR(regs);
 
 	qep->dev = dev;
 	qep->regs = regs;
-- 
2.47.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] counter: intel-qep: Replace deprecated PCI functions
  2024-10-28  9:13 [PATCH] counter: intel-qep: Replace deprecated PCI functions Philipp Stanner
@ 2024-11-01  6:04 ` William Breathitt Gray
  2024-11-01 13:12 ` Jarkko Nikula
  1 sibling, 0 replies; 3+ messages in thread
From: William Breathitt Gray @ 2024-11-01  6:04 UTC (permalink / raw)
  To: Jarkko Nikula, Philipp Stanner
  Cc: William Breathitt Gray, linux-iio, linux-kernel


On Mon, 28 Oct 2024 10:13:13 +0100, Philipp Stanner wrote:
> pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
> commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
> pcim_iomap_regions_request_all()").
> 
> Replace these functions with pcim_iomap_region().
> 
> 
> [...]

Applied, thanks!

[1/1] counter: intel-qep: Replace deprecated PCI functions
      commit: 522ae89b78580c62765e160aed3479297baa75be

Best regards,
-- 
William Breathitt Gray <wbg@kernel.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] counter: intel-qep: Replace deprecated PCI functions
  2024-10-28  9:13 [PATCH] counter: intel-qep: Replace deprecated PCI functions Philipp Stanner
  2024-11-01  6:04 ` William Breathitt Gray
@ 2024-11-01 13:12 ` Jarkko Nikula
  1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Nikula @ 2024-11-01 13:12 UTC (permalink / raw)
  To: Philipp Stanner, William Breathitt Gray; +Cc: linux-iio, linux-kernel

On 10/28/24 11:13 AM, Philipp Stanner wrote:
> pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
> commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
> pcim_iomap_regions_request_all()").
> 
> Replace these functions with pcim_iomap_region().
> 
> Signed-off-by: Philipp Stanner <pstanner@redhat.com>
> ---
>   drivers/counter/intel-qep.c | 10 +++-------
>   1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/counter/intel-qep.c b/drivers/counter/intel-qep.c
> index af5942e66f7d..ee2bae27b728 100644
> --- a/drivers/counter/intel-qep.c
> +++ b/drivers/counter/intel-qep.c
> @@ -408,13 +408,9 @@ static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
>   
>   	pci_set_master(pci);
>   
> -	ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci));
> -	if (ret)
> -		return ret;
> -
> -	regs = pcim_iomap_table(pci)[0];
> -	if (!regs)
> -		return -ENOMEM;
> +	regs = pcim_iomap_region(pci, 0, pci_name(pci));
> +	if (IS_ERR(regs))
> +		return PTR_ERR(regs);
>   
>   	qep->dev = dev;
>   	qep->regs = regs;

Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-11-01 13:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-28  9:13 [PATCH] counter: intel-qep: Replace deprecated PCI functions Philipp Stanner
2024-11-01  6:04 ` William Breathitt Gray
2024-11-01 13:12 ` Jarkko Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox