2 files changed, 18 insertions, 11 deletions

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 5e11b160f247..68ef6b563b7d 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -54,19 +54,13 @@ static int __init ahci_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        if (pdata && pdata->init) {
-                rc = pdata->init(dev);
-                if (rc)
-                        return rc;
-        }
-
         if (pdata && pdata->ata_port_info)
                 pi = *pdata->ata_port_info;
 
         hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
         if (!hpriv) {
-                rc = -ENOMEM;
-                goto err0;
+                dev_err(dev, "can't alloc ahci_host_priv\n");
+                return -ENOMEM;
         }
 
         hpriv->flags |= (unsigned long)pi.private_data;
@@ -74,8 +68,19 @@ static int __init ahci_probe(struct platform_device *pdev)
         hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem));
         if (!hpriv->mmio) {
                 dev_err(dev, "can't map %pR\n", mem);
-                rc = -ENOMEM;
-                goto err0;
+                return -ENOMEM;
+        }
+
+        /*
+         * Some platforms might need to prepare for mmio region access,
+         * which could be done in the following init call. So, the mmio
+         * region shouldn't be accessed before init (if provided) has
+         * returned successfully.
+         */
+        if (pdata && pdata->init) {
+                rc = pdata->init(dev, hpriv->mmio);
+                if (rc)
+                        return rc;
         }
 
         ahci_save_initial_config(dev, hpriv,
diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index f7dd576dd5a4..be3d9a77d6ed 100644
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -15,11 +15,13 @@
 #ifndef _AHCI_PLATFORM_H
 #define _AHCI_PLATFORM_H
 
+#include <linux/compiler.h>
+
 struct device;
 struct ata_port_info;
 
 struct ahci_platform_data {
-        int (*init)(struct device *dev);
+        int (*init)(struct device *dev, void __iomem *addr);
         void (*exit)(struct device *dev);
         const struct ata_port_info *ata_port_info;
         unsigned int force_port_map;