2021-09-01 08:56:03

by Cai,Huoqing

Subject: [PATCH] scsi: hisi_sas: Make use of the helper function devm_platform_ioremap_resource()

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <[email protected]>
---
drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 9515c45affa5..0c2309c951ab 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -2649,12 +2649,9 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
if (IS_ERR(hisi_hba->regs))
goto err_out;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- if (res) {
- hisi_hba->sgpio_regs = devm_ioremap_resource(dev, res);
- if (IS_ERR(hisi_hba->sgpio_regs))
- goto err_out;
- }
+ hisi_hba->sgpio_regs = devm_platform_ioremap_resource(pdev, 1);
+ if (IS_ERR(hisi_hba->sgpio_regs))
+ goto err_out;

if (hisi_sas_alloc(hisi_hba)) {
hisi_sas_free(hisi_hba);
--
2.25.1

2021-09-29 02:59:00

by Cai,Huoqing

Subject: RE: [PATCH] scsi: hisi_sas: Make use of the helper function devm_platform_ioremap_resource()

Hello,

Drop this patch.
Because sgpio_regs is optional which is used like this
if (!hisi_hba->sgpio_regs)
return -EOPNOTSUPP;

> -----Original Message-----
> From: Cai,Huoqing <[email protected]>
> Sent: 2021??9??1?? 16:52
> To: Cai,Huoqing
> Cc: John Garry; James E.J. Bottomley; Martin K. Petersen; linux-
> [email protected]; [email protected]
> Subject: [PATCH] scsi: hisi_sas: Make use of the helper function
> devm_platform_ioremap_resource()
>
> Use the devm_platform_ioremap_resource() helper instead of
> calling platform_get_resource() and devm_ioremap_resource()
> separately
>
> Signed-off-by: Cai Huoqing <[email protected]>
> ---
> drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c
> b/drivers/scsi/hisi_sas/hisi_sas_main.c
> index 9515c45affa5..0c2309c951ab 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas_main.c
> +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
> @@ -2649,12 +2649,9 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct
> platform_device *pdev,
> if (IS_ERR(hisi_hba->regs))
> goto err_out;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - if (res) {
> - hisi_hba->sgpio_regs = devm_ioremap_resource(dev, res);
> - if (IS_ERR(hisi_hba->sgpio_regs))
> - goto err_out;
> - }
> + hisi_hba->sgpio_regs = devm_platform_ioremap_resource(pdev, 1);
> + if (IS_ERR(hisi_hba->sgpio_regs))
> + goto err_out;
>
> if (hisi_sas_alloc(hisi_hba)) {
> hisi_sas_free(hisi_hba);
> --
> 2.25.1