Merge tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the "big" char and misc driver patches for 4.18-rc1.

  It's not a lot of stuff here, but there are some highlights:

   - coreboot driver updates

   - soundwire driver updates

   - android binder updates

   - fpga big sync, mostly documentation

   - lots of minor driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits)
  vmw_balloon: fixing double free when batching mode is off
  MAINTAINERS: Add driver-api/fpga path
  fpga: clarify that unregister functions also free
  documentation: fpga: move fpga-region.txt to driver-api
  documentation: fpga: add bridge document to driver-api
  documentation: fpga: move fpga-mgr.txt to driver-api
  Documentation: fpga: move fpga overview to driver-api
  fpga: region: kernel-doc fixes
  fpga: bridge: kernel-doc fixes
  fpga: mgr: kernel-doc fixes
  fpga: use SPDX
  fpga: region: change api, add fpga_region_create/free
  fpga: bridge: change api, don't use drvdata
  fpga: manager: change api, don't use drvdata
  fpga: region: don't use drvdata in common fpga code
  Drivers: hv: vmbus: Removed an unnecessary cast from void *
  ver_linux: Drop redundant calls to system() to test if file is readable
  ver_linux: Move stderr redirection from function parameter to function body
  misc: IBM Virtual Management Channel Driver (VMC)
  rpmsg: Correct support for MODULE_DEVICE_TABLE()
  ...

1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index 06d212a3d49d..24b25c626036 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -238,6 +238,8 @@ 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)
@@ -273,13 +275,25 @@ 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));
 
-        return fpga_mgr_register(&spi->dev, conf->mgr_name,
-                                 &altera_ps_ops, conf);
+        mgr = 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;
 }
 
 static int altera_ps_remove(struct spi_device *spi)
 {
-        fpga_mgr_unregister(&spi->dev);
+        struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+        fpga_mgr_unregister(mgr);
 
         return 0;
 }