mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Philipp Stanner <pstanner@redhat.com>,
	Pedro Sousa <pedrom.sousa@synopsys.com>,
	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	Bart Van Assche <bvanassche@acm.org>,
	Minwoo Im <minwoo.im@samsung.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] scsi: ufs: Replace deprecated PCI functions
Date: Wed, 30 Oct 2024 15:41:40 +0200	[thread overview]
Message-ID: <f1221990-8d89-4b60-b6f7-25540ad5ea55@intel.com> (raw)
In-Reply-To: <20241028102428.23118-2-pstanner@redhat.com>

On 28/10/24 12:24, 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>

Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/ufs/host/tc-dwc-g210-pci.c | 8 +++-----
>  drivers/ufs/host/ufshcd-pci.c      | 8 +++-----
>  2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/ufs/host/tc-dwc-g210-pci.c b/drivers/ufs/host/tc-dwc-g210-pci.c
> index 876781fd6861..0167d8bef71a 100644
> --- a/drivers/ufs/host/tc-dwc-g210-pci.c
> +++ b/drivers/ufs/host/tc-dwc-g210-pci.c
> @@ -80,14 +80,12 @@ tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  
>  	pci_set_master(pdev);
>  
> -	err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD);
> -	if (err < 0) {
> +	mmio_base = pcim_iomap_region(pdev, 0, UFSHCD);
> +	if (IS_ERR(mmio_base)) {
>  		dev_err(&pdev->dev, "request and iomap failed\n");
> -		return err;
> +		return PTR_ERR(mmio_base);
>  	}
>  
> -	mmio_base = pcim_iomap_table(pdev)[0];
> -
>  	err = ufshcd_alloc_host(&pdev->dev, &hba);
>  	if (err) {
>  		dev_err(&pdev->dev, "Allocation failed\n");
> diff --git a/drivers/ufs/host/ufshcd-pci.c b/drivers/ufs/host/ufshcd-pci.c
> index 54e0cc0653a2..ea39c5d5b8cf 100644
> --- a/drivers/ufs/host/ufshcd-pci.c
> +++ b/drivers/ufs/host/ufshcd-pci.c
> @@ -588,14 +588,12 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  
>  	pci_set_master(pdev);
>  
> -	err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD);
> -	if (err < 0) {
> +	mmio_base = pcim_iomap_region(pdev, 0, UFSHCD);
> +	if (IS_ERR(mmio_base)) {
>  		dev_err(&pdev->dev, "request and iomap failed\n");
> -		return err;
> +		return PTR_ERR(mmio_base);
>  	}
>  
> -	mmio_base = pcim_iomap_table(pdev)[0];
> -
>  	err = ufshcd_alloc_host(&pdev->dev, &hba);
>  	if (err) {
>  		dev_err(&pdev->dev, "Allocation failed\n");


  parent reply	other threads:[~2024-10-30 13:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-28 10:24 Philipp Stanner
2024-10-28 11:55 ` Bean Huo
2024-10-30 13:41 ` Adrian Hunter [this message]
2024-11-03  0:27 ` Martin K. Petersen
2024-11-14  2:50 ` Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f1221990-8d89-4b60-b6f7-25540ad5ea55@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bvanassche@acm.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=minwoo.im@samsung.com \
    --cc=pedrom.sousa@synopsys.com \
    --cc=pstanner@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome