* [PATCH] ata:ahci_xgene:use devm_platform_ioremap_resource() to simplify code
@ 2020-04-01 8:49 Tang Bin
2020-04-01 9:03 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Tang Bin @ 2020-04-01 8:49 UTC (permalink / raw)
To: axboe; +Cc: linux-ide, linux-kernel, Tang Bin
In this function, devm_platform_ioremap_resource() should be suitable
to simplify code.
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
---
drivers/ata/ahci_xgene.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index 16246c843..061209275 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -739,7 +739,6 @@ static int xgene_ahci_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv;
struct xgene_ahci_context *ctx;
- struct resource *res;
const struct of_device_id *of_devid;
enum xgene_ahci_version version = XGENE_AHCI_V1;
const struct ata_port_info *ppi[] = { &xgene_ahci_v1_port_info,
@@ -759,32 +758,24 @@ static int xgene_ahci_probe(struct platform_device *pdev)
ctx->dev = dev;
/* Retrieve the IP core resource */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- ctx->csr_core = devm_ioremap_resource(dev, res);
+ ctx->csr_core = devm_platform_ioremap_resource(pdev, 1);
if (IS_ERR(ctx->csr_core))
return PTR_ERR(ctx->csr_core);
/* Retrieve the IP diagnostic resource */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
- ctx->csr_diag = devm_ioremap_resource(dev, res);
+ ctx->csr_diag = devm_platform_ioremap_resource(pdev, 2);
if (IS_ERR(ctx->csr_diag))
return PTR_ERR(ctx->csr_diag);
/* Retrieve the IP AXI resource */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
- ctx->csr_axi = devm_ioremap_resource(dev, res);
+ ctx->csr_axi = devm_platform_ioremap_resource(pdev, 3);
if (IS_ERR(ctx->csr_axi))
return PTR_ERR(ctx->csr_axi);
/* Retrieve the optional IP mux resource */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 4);
- if (res) {
- void __iomem *csr = devm_ioremap_resource(dev, res);
- if (IS_ERR(csr))
- return PTR_ERR(csr);
-
- ctx->csr_mux = csr;
- }
+ ctx->csr_mux = devm_platform_ioremap_resource(pdev, 4);
+ if (IS_ERR(ctx->csr_mux))
+ return PTR_ERR(ctx->csr_mux);
of_devid = of_match_device(xgene_ahci_of_match, dev);
if (of_devid) {
--
2.20.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ata:ahci_xgene:use devm_platform_ioremap_resource() to simplify code
2020-04-01 8:49 [PATCH] ata:ahci_xgene:use devm_platform_ioremap_resource() to simplify code Tang Bin
@ 2020-04-01 9:03 ` Sergei Shtylyov
[not found] ` <202004011744223003066@cmss.chinamobile.com>
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2020-04-01 9:03 UTC (permalink / raw)
To: Tang Bin, axboe; +Cc: linux-ide, linux-kernel
Hello!
On 01.04.2020 11:49, Tang Bin wrote:
> In this function, devm_platform_ioremap_resource() should be suitable
> to simplify code.
>
> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
> ---
> drivers/ata/ahci_xgene.c | 21 ++++++---------------
> 1 file changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
> index 16246c843..061209275 100644
> --- a/drivers/ata/ahci_xgene.c
> +++ b/drivers/ata/ahci_xgene.c
[...]
> /* Retrieve the optional IP mux resource */
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 4);
> - if (res) {
> - void __iomem *csr = devm_ioremap_resource(dev, res);
> - if (IS_ERR(csr))
> - return PTR_ERR(csr);
> -
> - ctx->csr_mux = csr;
> - }
> + ctx->csr_mux = devm_platform_ioremap_resource(pdev, 4);
> + if (IS_ERR(ctx->csr_mux))
> + return PTR_ERR(ctx->csr_mux);
The previous code allowed the memory resource #4 to be absent, the new
code makes it mandatory? Is that intentional?
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-04 19:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01 8:49 [PATCH] ata:ahci_xgene:use devm_platform_ioremap_resource() to simplify code Tang Bin
2020-04-01 9:03 ` Sergei Shtylyov
[not found] ` <202004011744223003066@cmss.chinamobile.com>
2020-04-04 19:58 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.