linux-kernel - Re: [PATCH] scsi: ufs: Replace deprecated PCI functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <f1221990-8d89-4b60-b6f7-25540ad5ea55@intel.com>
Date: Wed, 30 Oct 2024 15:41:40 +0200
From: Adrian Hunter <adrian.hunter@...el.com>
To: Philipp Stanner <pstanner@...hat.com>,
 Pedro Sousa <pedrom.sousa@...opsys.com>,
 "James E.J. Bottomley" <James.Bottomley@...senPartnership.com>,
 "Martin K. Petersen" <martin.petersen@...cle.com>,
 Bart Van Assche <bvanassche@....org>, Minwoo Im <minwoo.im@...sung.com>
Cc: linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] scsi: ufs: Replace deprecated PCI functions

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@...hat.com>

Reviewed-by: Adrian Hunter <adrian.hunter@...el.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");