Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

drm-next is forwarded to v4.20-rc1, and we need this to make
a patch series apply.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

23 files changed, 231 insertions, 143 deletions

diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index 7fa793672a7a..610a1558e0ed 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -453,8 +453,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,
         snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s",
                  ALTERA_CVP_MGR_NAME, pci_name(pdev));
 
-        mgr = fpga_mgr_create(&pdev->dev, conf->mgr_name,
-                              &altera_cvp_ops, conf);
+        mgr = devm_fpga_mgr_create(&pdev->dev, conf->mgr_name,
+                                   &altera_cvp_ops, conf);
         if (!mgr) {
                 ret = -ENOMEM;
                 goto err_unmap;
@@ -463,10 +463,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,
         pci_set_drvdata(pdev, mgr);
 
         ret = fpga_mgr_register(mgr);
-        if (ret) {
-                fpga_mgr_free(mgr);
+        if (ret)
                 goto err_unmap;
-        }
 
         ret = driver_create_file(&altera_cvp_driver.driver,
                                  &driver_attr_chkcfg);
diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c
index 23660ccd634b..a78e49c63c64 100644
--- a/drivers/fpga/altera-fpga2sdram.c
+++ b/drivers/fpga/altera-fpga2sdram.c
@@ -121,18 +121,16 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
         /* Get f2s bridge configuration saved in handoff register */
         regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
 
-        br = fpga_bridge_create(dev, F2S_BRIDGE_NAME,
-                                &altera_fpga2sdram_br_ops, priv);
+        br = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME,
+                                     &altera_fpga2sdram_br_ops, priv);
         if (!br)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, br);
 
         ret = fpga_bridge_register(br);
-        if (ret) {
-                fpga_bridge_free(br);
+        if (ret)
                 return ret;
-        }
 
         dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);
 
diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index ffd586c48ecf..dd58c4aea92e 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -213,7 +213,6 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
         struct fpga_bridge *br;
         struct resource *res;
         u32 status, revision;
-        int ret;
 
         if (!np)
                 return -ENODEV;
@@ -245,20 +244,14 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
 
         priv->base_addr = base_addr;
 
-        br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
-                                &altera_freeze_br_br_ops, priv);
+        br = devm_fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
+                                     &altera_freeze_br_br_ops, priv);
         if (!br)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, br);
 
-        ret = fpga_bridge_register(br);
-        if (ret) {
-                fpga_bridge_free(br);
-                return ret;
-        }
-
-        return 0;
+        return fpga_bridge_register(br);
 }
 
 static int altera_freeze_br_remove(struct platform_device *pdev)
diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index a974d3f60321..77b95f251821 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -180,7 +180,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                 }
         }
 
-        br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv);
+        br = devm_fpga_bridge_create(dev, priv->name,
+                                     &altera_hps2fpga_br_ops, priv);
         if (!br) {
                 ret = -ENOMEM;
                 goto err;
@@ -190,12 +191,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 
         ret = fpga_bridge_register(br);
         if (ret)
-                goto err_free;
+                goto err;
 
         return 0;
 
-err_free:
-        fpga_bridge_free(br);
 err:
         clk_disable_unprepare(priv->clk);
 
diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera-pr-ip-core.c
index 65e0b6a2c031..a7a3bf0b5202 100644
--- a/drivers/fpga/altera-pr-ip-core.c
+++ b/drivers/fpga/altera-pr-ip-core.c
@@ -177,7 +177,6 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
 {
         struct alt_pr_priv *priv;
         struct fpga_manager *mgr;
-        int ret;
         u32 val;
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -192,17 +191,13 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
                 (val & ALT_PR_CSR_STATUS_MSK) >> ALT_PR_CSR_STATUS_SFT,
                 (int)(val & ALT_PR_CSR_PR_START));
 
-        mgr = fpga_mgr_create(dev, dev_name(dev), &alt_pr_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, dev_name(dev), &alt_pr_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
         dev_set_drvdata(dev, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);
 
diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index 24b25c626036..33aafda50af5 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -239,7 +239,6 @@ static int altera_ps_probe(struct spi_device *spi)
         struct altera_ps_conf *conf;
         const struct of_device_id *of_id;
         struct fpga_manager *mgr;
-        int ret;
 
         conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
         if (!conf)
@@ -275,18 +274,14 @@ static int altera_ps_probe(struct spi_device *spi)
         snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",
                  dev_driver_string(&spi->dev), dev_name(&spi->dev));
 
-        mgr = fpga_mgr_create(&spi->dev, conf->mgr_name,
-                              &altera_ps_ops, conf);
+        mgr = devm_fpga_mgr_create(&spi->dev, conf->mgr_name,
+                                   &altera_ps_ops, conf);
         if (!mgr)
                 return -ENOMEM;
 
         spi_set_drvdata(spi, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int altera_ps_remove(struct spi_device *spi)
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
index 0e81d33af856..025aba3ea76c 100644
--- a/drivers/fpga/dfl-afu-dma-region.c
+++ b/drivers/fpga/dfl-afu-dma-region.c
@@ -70,7 +70,7 @@ static int afu_dma_adjust_locked_vm(struct device *dev, long npages, bool incr)
         dev_dbg(dev, "[%d] RLIMIT_MEMLOCK %c%ld %ld/%ld%s\n", current->pid,
                 incr ? '+' : '-', npages << PAGE_SHIFT,
                 current->mm->locked_vm << PAGE_SHIFT, rlimit(RLIMIT_MEMLOCK),
-                ret ? "- execeeded" : "");
+                ret ? "- exceeded" : "");
 
         up_write(&current->mm->mmap_sem);
 
diff --git a/drivers/fpga/dfl-fme-br.c b/drivers/fpga/dfl-fme-br.c
index 7cc041def8b3..3ff9f3a687ce 100644
--- a/drivers/fpga/dfl-fme-br.c
+++ b/drivers/fpga/dfl-fme-br.c
@@ -61,7 +61,6 @@ static int fme_br_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct fme_br_priv *priv;
         struct fpga_bridge *br;
-        int ret;
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -69,18 +68,14 @@ static int fme_br_probe(struct platform_device *pdev)
 
         priv->pdata = dev_get_platdata(dev);
 
-        br = fpga_bridge_create(dev, "DFL FPGA FME Bridge",
-                                &fme_bridge_ops, priv);
+        br = devm_fpga_bridge_create(dev, "DFL FPGA FME Bridge",
+                                     &fme_bridge_ops, priv);
         if (!br)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, br);
 
-        ret = fpga_bridge_register(br);
-        if (ret)
-                fpga_bridge_free(br);
-
-        return ret;
+        return fpga_bridge_register(br);
 }
 
 static int fme_br_remove(struct platform_device *pdev)
diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c
index b5ef405b6d88..76f37709dd1a 100644
--- a/drivers/fpga/dfl-fme-mgr.c
+++ b/drivers/fpga/dfl-fme-mgr.c
@@ -201,7 +201,7 @@ static int fme_mgr_write(struct fpga_manager *mgr,
                 }
 
                 if (count < 4) {
-                        dev_err(dev, "Invaild PR bitstream size\n");
+                        dev_err(dev, "Invalid PR bitstream size\n");
                         return -EINVAL;
                 }
 
@@ -287,7 +287,6 @@ static int fme_mgr_probe(struct platform_device *pdev)
         struct fme_mgr_priv *priv;
         struct fpga_manager *mgr;
         struct resource *res;
-        int ret;
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -309,19 +308,15 @@ static int fme_mgr_probe(struct platform_device *pdev)
 
         fme_mgr_get_compat_id(priv->ioaddr, compat_id);
 
-        mgr = fpga_mgr_create(dev, "DFL FME FPGA Manager",
-                              &fme_mgr_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, "DFL FME FPGA Manager",
+                                   &fme_mgr_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
         mgr->compat_id = compat_id;
         platform_set_drvdata(pdev, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int fme_mgr_remove(struct platform_device *pdev)
diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c
index 0b7e19c27c6d..ec134ec93f08 100644
--- a/drivers/fpga/dfl-fme-region.c
+++ b/drivers/fpga/dfl-fme-region.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/fpga/fpga-mgr.h>
 #include <linux/fpga/fpga-region.h>
 
 #include "dfl-fme-pr.h"
@@ -38,7 +39,7 @@ static int fme_region_probe(struct platform_device *pdev)
         if (IS_ERR(mgr))
                 return -EPROBE_DEFER;
 
-        region = fpga_region_create(dev, mgr, fme_region_get_bridges);
+        region = devm_fpga_region_create(dev, mgr, fme_region_get_bridges);
         if (!region) {
                 ret = -ENOMEM;
                 goto eprobe_mgr_put;
@@ -50,14 +51,12 @@ static int fme_region_probe(struct platform_device *pdev)
 
         ret = fpga_region_register(region);
         if (ret)
-                goto region_free;
+                goto eprobe_mgr_put;
 
         dev_dbg(dev, "DFL FME FPGA Region probed\n");
 
         return 0;
 
-region_free:
-        fpga_region_free(region);
 eprobe_mgr_put:
         fpga_mgr_put(mgr);
         return ret;
@@ -66,9 +65,10 @@ eprobe_mgr_put:
 static int fme_region_remove(struct platform_device *pdev)
 {
         struct fpga_region *region = dev_get_drvdata(&pdev->dev);
+        struct fpga_manager *mgr = region->mgr;
 
         fpga_region_unregister(region);
-        fpga_mgr_put(region->mgr);
+        fpga_mgr_put(mgr);
 
         return 0;
 }
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index a9b521bccb06..2c09e502e721 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -899,7 +899,7 @@ dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info)
         if (!cdev)
                 return ERR_PTR(-ENOMEM);
 
-        cdev->region = fpga_region_create(info->dev, NULL, NULL);
+        cdev->region = devm_fpga_region_create(info->dev, NULL, NULL);
         if (!cdev->region) {
                 ret = -ENOMEM;
                 goto free_cdev_exit;
@@ -911,7 +911,7 @@ dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info)
 
         ret = fpga_region_register(cdev->region);
         if (ret)
-                goto free_region_exit;
+                goto free_cdev_exit;
 
         /* create and init build info for enumeration */
         binfo = devm_kzalloc(info->dev, sizeof(*binfo), GFP_KERNEL);
@@ -942,8 +942,6 @@ dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info)
 
 unregister_region_exit:
         fpga_region_unregister(cdev->region);
-free_region_exit:
-        fpga_region_free(cdev->region);
 free_cdev_exit:
         devm_kfree(info->dev, cdev);
         return ERR_PTR(ret);
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 24b8f98b73ec..80bd8f1b2aa6 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -125,7 +125,7 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)
  *
  * Given a device, get an exclusive reference to a fpga bridge.
  *
- * Return: fpga manager struct or IS_ERR() condition containing error code.
+ * Return: fpga bridge struct or IS_ERR() condition containing error code.
  */
 struct fpga_bridge *fpga_bridge_get(struct device *dev,
                                     struct fpga_image_info *info)
@@ -324,6 +324,9 @@ ATTRIBUTE_GROUPS(fpga_bridge);
  * @br_ops:     pointer to structure of fpga bridge ops
  * @priv:       FPGA bridge private data
  *
+ * The caller of this function is responsible for freeing the bridge with
+ * fpga_bridge_free().  Using devm_fpga_bridge_create() instead is recommended.
+ *
  * Return: struct fpga_bridge or NULL
  */
 struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
@@ -378,8 +381,8 @@ error_kfree:
 EXPORT_SYMBOL_GPL(fpga_bridge_create);
 
 /**
- * fpga_bridge_free - free a fpga bridge and its id
- * @bridge:     FPGA bridge struct created by fpga_bridge_create
+ * fpga_bridge_free - free a fpga bridge created by fpga_bridge_create()
+ * @bridge:     FPGA bridge struct
  */
 void fpga_bridge_free(struct fpga_bridge *bridge)
 {
@@ -388,9 +391,56 @@ void fpga_bridge_free(struct fpga_bridge *bridge)
 }
 EXPORT_SYMBOL_GPL(fpga_bridge_free);
 
+static void devm_fpga_bridge_release(struct device *dev, void *res)
+{
+        struct fpga_bridge *bridge = *(struct fpga_bridge **)res;
+
+        fpga_bridge_free(bridge);
+}
+
 /**
- * fpga_bridge_register - register a fpga bridge
- * @bridge:     FPGA bridge struct created by fpga_bridge_create
+ * devm_fpga_bridge_create - create and init a managed struct fpga_bridge
+ * @dev:        FPGA bridge device from pdev
+ * @name:       FPGA bridge name
+ * @br_ops:     pointer to structure of fpga bridge ops
+ * @priv:       FPGA bridge private data
+ *
+ * This function is intended for use in a FPGA bridge driver's probe function.
+ * After the bridge driver creates the struct with devm_fpga_bridge_create(), it
+ * should register the bridge with fpga_bridge_register().  The bridge driver's
+ * remove function should call fpga_bridge_unregister().  The bridge struct
+ * allocated with this function will be freed automatically on driver detach.
+ * This includes the case of a probe function returning error before calling
+ * fpga_bridge_register(), the struct will still get cleaned up.
+ *
+ *  Return: struct fpga_bridge or NULL
+ */
+struct fpga_bridge
+*devm_fpga_bridge_create(struct device *dev, const char *name,
+                         const struct fpga_bridge_ops *br_ops, void *priv)
+{
+        struct fpga_bridge **ptr, *bridge;
+
+        ptr = devres_alloc(devm_fpga_bridge_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        bridge = fpga_bridge_create(dev, name, br_ops, priv);
+        if (!bridge) {
+                devres_free(ptr);
+        } else {
+                *ptr = bridge;
+                devres_add(dev, ptr);
+        }
+
+        return bridge;
+}
+EXPORT_SYMBOL_GPL(devm_fpga_bridge_create);
+
+/**
+ * fpga_bridge_register - register a FPGA bridge
+ *
+ * @bridge: FPGA bridge struct
  *
  * Return: 0 for success, error code otherwise.
  */
@@ -412,8 +462,11 @@ int fpga_bridge_register(struct fpga_bridge *bridge)
 EXPORT_SYMBOL_GPL(fpga_bridge_register);
 
 /**
- * fpga_bridge_unregister - unregister and free a fpga bridge
- * @bridge:     FPGA bridge struct created by fpga_bridge_create
+ * fpga_bridge_unregister - unregister a FPGA bridge
+ *
+ * @bridge: FPGA bridge struct
+ *
+ * This function is intended for use in a FPGA bridge driver's remove function.
  */
 void fpga_bridge_unregister(struct fpga_bridge *bridge)
 {
@@ -430,9 +483,6 @@ EXPORT_SYMBOL_GPL(fpga_bridge_unregister);
 
 static void fpga_bridge_dev_release(struct device *dev)
 {
-        struct fpga_bridge *bridge = to_fpga_bridge(dev);
-
-        fpga_bridge_free(bridge);
 }
 
 static int __init fpga_bridge_dev_init(void)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index a41b07e37884..c3866816456a 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -558,6 +558,9 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
  * @mops:       pointer to structure of fpga manager ops
  * @priv:       fpga manager private data
  *
+ * The caller of this function is responsible for freeing the struct with
+ * fpga_mgr_free().  Using devm_fpga_mgr_create() instead is recommended.
+ *
  * Return: pointer to struct fpga_manager or NULL
  */
 struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
@@ -618,8 +621,8 @@ error_kfree:
 EXPORT_SYMBOL_GPL(fpga_mgr_create);
 
 /**
- * fpga_mgr_free - deallocate a FPGA manager
- * @mgr:        fpga manager struct created by fpga_mgr_create
+ * fpga_mgr_free - free a FPGA manager created with fpga_mgr_create()
+ * @mgr:        fpga manager struct
  */
 void fpga_mgr_free(struct fpga_manager *mgr)
 {
@@ -628,9 +631,55 @@ void fpga_mgr_free(struct fpga_manager *mgr)
 }
 EXPORT_SYMBOL_GPL(fpga_mgr_free);
 
+static void devm_fpga_mgr_release(struct device *dev, void *res)
+{
+        struct fpga_manager *mgr = *(struct fpga_manager **)res;
+
+        fpga_mgr_free(mgr);
+}
+
+/**
+ * devm_fpga_mgr_create - create and initialize a managed FPGA manager struct
+ * @dev:        fpga manager device from pdev
+ * @name:       fpga manager name
+ * @mops:       pointer to structure of fpga manager ops
+ * @priv:       fpga manager private data
+ *
+ * This function is intended for use in a FPGA manager driver's probe function.
+ * After the manager driver creates the manager struct with
+ * devm_fpga_mgr_create(), it should register it with fpga_mgr_register().  The
+ * manager driver's remove function should call fpga_mgr_unregister().  The
+ * manager struct allocated with this function will be freed automatically on
+ * driver detach.  This includes the case of a probe function returning error
+ * before calling fpga_mgr_register(), the struct will still get cleaned up.
+ *
+ * Return: pointer to struct fpga_manager or NULL
+ */
+struct fpga_manager *devm_fpga_mgr_create(struct device *dev, const char *name,
+                                          const struct fpga_manager_ops *mops,
+                                          void *priv)
+{
+        struct fpga_manager **ptr, *mgr;
+
+        ptr = devres_alloc(devm_fpga_mgr_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        mgr = fpga_mgr_create(dev, name, mops, priv);
+        if (!mgr) {
+                devres_free(ptr);
+        } else {
+                *ptr = mgr;
+                devres_add(dev, ptr);
+        }
+
+        return mgr;
+}
+EXPORT_SYMBOL_GPL(devm_fpga_mgr_create);
+
 /**
  * fpga_mgr_register - register a FPGA manager
- * @mgr:        fpga manager struct created by fpga_mgr_create
+ * @mgr: fpga manager struct
  *
  * Return: 0 on success, negative error code otherwise.
  */
@@ -661,8 +710,10 @@ error_device:
 EXPORT_SYMBOL_GPL(fpga_mgr_register);
 
 /**
- * fpga_mgr_unregister - unregister and free a FPGA manager
- * @mgr:        fpga manager struct
+ * fpga_mgr_unregister - unregister a FPGA manager
+ * @mgr: fpga manager struct
+ *
+ * This function is intended for use in a FPGA manager driver's remove function.
  */
 void fpga_mgr_unregister(struct fpga_manager *mgr)
 {
@@ -681,9 +732,6 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unregister);
 
 static void fpga_mgr_dev_release(struct device *dev)
 {
-        struct fpga_manager *mgr = to_fpga_manager(dev);
-
-        fpga_mgr_free(mgr);
 }
 
 static int __init fpga_mgr_class_init(void)
diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 0d65220d5ec5..bde5a9d460c5 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -185,6 +185,10 @@ ATTRIBUTE_GROUPS(fpga_region);
  * @mgr: manager that programs this region
  * @get_bridges: optional function to get bridges to a list
  *
+ * The caller of this function is responsible for freeing the resulting region
+ * struct with fpga_region_free().  Using devm_fpga_region_create() instead is
+ * recommended.
+ *
  * Return: struct fpga_region or NULL
  */
 struct fpga_region
@@ -230,8 +234,8 @@ err_free:
 EXPORT_SYMBOL_GPL(fpga_region_create);
 
 /**
- * fpga_region_free - free a struct fpga_region
- * @region: FPGA region created by fpga_region_create
+ * fpga_region_free - free a FPGA region created by fpga_region_create()
+ * @region: FPGA region
  */
 void fpga_region_free(struct fpga_region *region)
 {
@@ -240,21 +244,69 @@ void fpga_region_free(struct fpga_region *region)
 }
 EXPORT_SYMBOL_GPL(fpga_region_free);
 
+static void devm_fpga_region_release(struct device *dev, void *res)
+{
+        struct fpga_region *region = *(struct fpga_region **)res;
+
+        fpga_region_free(region);
+}
+
+/**
+ * devm_fpga_region_create - create and initialize a managed FPGA region struct
+ * @dev: device parent
+ * @mgr: manager that programs this region
+ * @get_bridges: optional function to get bridges to a list
+ *
+ * This function is intended for use in a FPGA region driver's probe function.
+ * After the region driver creates the region struct with
+ * devm_fpga_region_create(), it should register it with fpga_region_register().
+ * The region driver's remove function should call fpga_region_unregister().
+ * The region struct allocated with this function will be freed automatically on
+ * driver detach.  This includes the case of a probe function returning error
+ * before calling fpga_region_register(), the struct will still get cleaned up.
+ *
+ * Return: struct fpga_region or NULL
+ */
+struct fpga_region
+*devm_fpga_region_create(struct device *dev,
+                         struct fpga_manager *mgr,
+                         int (*get_bridges)(struct fpga_region *))
+{
+        struct fpga_region **ptr, *region;
+
+        ptr = devres_alloc(devm_fpga_region_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        region = fpga_region_create(dev, mgr, get_bridges);
+        if (!region) {
+                devres_free(ptr);
+        } else {
+                *ptr = region;
+                devres_add(dev, ptr);
+        }
+
+        return region;
+}
+EXPORT_SYMBOL_GPL(devm_fpga_region_create);
+
 /**
  * fpga_region_register - register a FPGA region
- * @region: FPGA region created by fpga_region_create
+ * @region: FPGA region
+ *
  * Return: 0 or -errno
  */
 int fpga_region_register(struct fpga_region *region)
 {
         return device_add(&region->dev);
-
 }
 EXPORT_SYMBOL_GPL(fpga_region_register);
 
 /**
- * fpga_region_unregister - unregister and free a FPGA region
+ * fpga_region_unregister - unregister a FPGA region
  * @region: FPGA region
+ *
+ * This function is intended for use in a FPGA region driver's remove function.
  */
 void fpga_region_unregister(struct fpga_region *region)
 {
@@ -264,9 +316,6 @@ EXPORT_SYMBOL_GPL(fpga_region_unregister);
 
 static void fpga_region_dev_release(struct device *dev)
 {
-        struct fpga_region *region = to_fpga_region(dev);
-
-        fpga_region_free(region);
 }
 
 /**
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
index 5981c7ee7a7d..6154661b8f76 100644
--- a/drivers/fpga/ice40-spi.c
+++ b/drivers/fpga/ice40-spi.c
@@ -175,18 +175,14 @@ static int ice40_fpga_probe(struct spi_device *spi)
                 return ret;
         }
 
-        mgr = fpga_mgr_create(dev, "Lattice iCE40 FPGA Manager",
-                              &ice40_fpga_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, "Lattice iCE40 FPGA Manager",
+                                   &ice40_fpga_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
         spi_set_drvdata(spi, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int ice40_fpga_remove(struct spi_device *spi)
diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c
index a582e0000c97..4d8a87641587 100644
--- a/drivers/fpga/machxo2-spi.c
+++ b/drivers/fpga/machxo2-spi.c
@@ -356,25 +356,20 @@ static int machxo2_spi_probe(struct spi_device *spi)
 {
         struct device *dev = &spi->dev;
         struct fpga_manager *mgr;
-        int ret;
 
         if (spi->max_speed_hz > MACHXO2_MAX_SPEED) {
                 dev_err(dev, "Speed is too high\n");
                 return -EINVAL;
         }
 
-        mgr = fpga_mgr_create(dev, "Lattice MachXO2 SPI FPGA Manager",
-                              &machxo2_ops, spi);
+        mgr = devm_fpga_mgr_create(dev, "Lattice MachXO2 SPI FPGA Manager",
+                                   &machxo2_ops, spi);
         if (!mgr)
                 return -ENOMEM;
 
         spi_set_drvdata(spi, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int machxo2_spi_remove(struct spi_device *spi)
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 35fabb8083fb..122286fd255a 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -410,7 +410,7 @@ static int of_fpga_region_probe(struct platform_device *pdev)
         if (IS_ERR(mgr))
                 return -EPROBE_DEFER;
 
-        region = fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
+        region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
         if (!region) {
                 ret = -ENOMEM;
                 goto eprobe_mgr_put;
@@ -418,7 +418,7 @@ static int of_fpga_region_probe(struct platform_device *pdev)
 
         ret = fpga_region_register(region);
         if (ret)
-                goto eprobe_free;
+                goto eprobe_mgr_put;
 
         of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
         dev_set_drvdata(dev, region);
@@ -427,8 +427,6 @@ static int of_fpga_region_probe(struct platform_device *pdev)
 
         return 0;
 
-eprobe_free:
-        fpga_region_free(region);
 eprobe_mgr_put:
         fpga_mgr_put(mgr);
         return ret;
@@ -437,9 +435,10 @@ eprobe_mgr_put:
 static int of_fpga_region_remove(struct platform_device *pdev)
 {
         struct fpga_region *region = platform_get_drvdata(pdev);
+        struct fpga_manager *mgr = region->mgr;
 
         fpga_region_unregister(region);
-        fpga_mgr_put(region->mgr);
+        fpga_mgr_put(mgr);
 
         return 0;
 }
diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index be30c48eb6e4..573d88bdf730 100644
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -508,8 +508,8 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
                 return -EBUSY;
         }
 
-        mgr = fpga_mgr_create(dev, "SoCFPGA Arria10 FPGA Manager",
-                              &socfpga_a10_fpga_mgr_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, "SoCFPGA Arria10 FPGA Manager",
+                                   &socfpga_a10_fpga_mgr_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
@@ -517,7 +517,6 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
 
         ret = fpga_mgr_register(mgr);
         if (ret) {
-                fpga_mgr_free(mgr);
                 clk_disable_unprepare(priv->clk);
                 return ret;
         }
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 959d71f26896..4a8a2fcd4e6c 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -571,18 +571,14 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        mgr = fpga_mgr_create(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, "Altera SOCFPGA FPGA Manager",
+                                   &socfpga_fpga_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index 08efd1895b1b..dc22a5842609 100644
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -118,7 +118,6 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
         struct ts73xx_fpga_priv *priv;
         struct fpga_manager *mgr;
         struct resource *res;
-        int ret;
 
         priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -133,18 +132,14 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
                 return PTR_ERR(priv->io_base);
         }
 
-        mgr = fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
-                              &ts73xx_fpga_ops, priv);
+        mgr = devm_fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
+                                   &ts73xx_fpga_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)
diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index 07ba1539e82c..641036135207 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -121,8 +121,8 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
 
         clk_disable(priv->clk);
 
-        br = fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
-                                &xlnx_pr_decoupler_br_ops, priv);
+        br = devm_fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
+                                     &xlnx_pr_decoupler_br_ops, priv);
         if (!br) {
                 err = -ENOMEM;
                 goto err_clk;
diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index 8d1945966533..469486be20c4 100644
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -144,7 +144,6 @@ static int xilinx_spi_probe(struct spi_device *spi)
 {
         struct xilinx_spi_conf *conf;
         struct fpga_manager *mgr;
-        int ret;
 
         conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
         if (!conf)
@@ -167,18 +166,15 @@ static int xilinx_spi_probe(struct spi_device *spi)
                 return PTR_ERR(conf->done);
         }
 
-        mgr = fpga_mgr_create(&spi->dev, "Xilinx Slave Serial FPGA Manager",
-                              &xilinx_spi_ops, conf);
+        mgr = devm_fpga_mgr_create(&spi->dev,
+                                   "Xilinx Slave Serial FPGA Manager",
+                                   &xilinx_spi_ops, conf);
         if (!mgr)
                 return -ENOMEM;
 
         spi_set_drvdata(spi, mgr);
 
-        ret = fpga_mgr_register(mgr);
-        if (ret)
-                fpga_mgr_free(mgr);
-
-        return ret;
+        return fpga_mgr_register(mgr);
 }
 
 static int xilinx_spi_remove(struct spi_device *spi)
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 3110e00121ca..bb82efeebb9d 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -614,8 +614,8 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
         clk_disable(priv->clk);
 
-        mgr = fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
-                              &zynq_fpga_ops, priv);
+        mgr = devm_fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
+                                   &zynq_fpga_ops, priv);
         if (!mgr)
                 return -ENOMEM;
 
@@ -624,7 +624,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
         err = fpga_mgr_register(mgr);
         if (err) {
                 dev_err(dev, "unable to register FPGA manager\n");
-                fpga_mgr_free(mgr);
                 clk_unprepare(priv->clk);
                 return err;
         }