diff options
author | Serge Semin <Sergey.Semin@baikalelectronics.ru> | 2022-09-09 22:36:04 +0300 |
---|---|---|
committer | Damien Le Moal <damien.lemoal@opensource.wdc.com> | 2022-09-17 01:39:18 +0900 |
commit | 82d437e6dcb10e07e1a109d74924e30b9ec6ea56 (patch) | |
tree | 377040e3f343d9aa4b9de2cd317dbc6c5970bc33 | |
parent | 2ea4d52ad11a9234eb7252377ba873c311896997 (diff) | |
download | linux-stable-82d437e6dcb10e07e1a109d74924e30b9ec6ea56.tar.gz linux-stable-82d437e6dcb10e07e1a109d74924e30b9ec6ea56.tar.bz2 linux-stable-82d437e6dcb10e07e1a109d74924e30b9ec6ea56.zip |
ata: libahci_platform: Convert to using platform devm-ioremap methods
Currently the IOMEM AHCI registers space is mapped by means of the
two functions invocation: platform_get_resource() is used to get the very
first memory resource and devm_ioremap_resource() is called to remap that
resource. Device-managed kernel API provides a handy wrapper to perform
the same in single function call: devm_platform_ioremap_resource().
While at it seeing many AHCI platform drivers rely on having the AHCI CSR
space marked with "ahci" name let's first try to find and remap the CSR
IO-mem with that name and only if it fails fallback to getting the very
first registers space platform resource.
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-rw-r--r-- | drivers/ata/libahci_platform.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 32495ae96567..1e9e825d6cc5 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -402,8 +402,14 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, devres_add(dev, hpriv); - hpriv->mmio = devm_ioremap_resource(dev, - platform_get_resource(pdev, IORESOURCE_MEM, 0)); + /* + * If the DT provided an "ahci" named resource, use it. Otherwise, + * fallback to using the default first resource for the device node. + */ + if (platform_get_resource_byname(pdev, IORESOURCE_MEM, "ahci")) + hpriv->mmio = devm_platform_ioremap_resource_byname(pdev, "ahci"); + else + hpriv->mmio = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hpriv->mmio)) { rc = PTR_ERR(hpriv->mmio); goto err_out; |