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, 14 insertions, 5 deletions

diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index 77b04e4b3254..dd4edd8f22ce 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -401,6 +401,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
                             const struct pci_device_id *dev_id)
 {
         struct altera_cvp_conf *conf;
+        struct fpga_manager *mgr;
         u16 cmd, val;
         int ret;
 
@@ -452,16 +453,24 @@ 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));
 
-        ret = fpga_mgr_register(&pdev->dev, conf->mgr_name,
-                                &altera_cvp_ops, conf);
-        if (ret)
+        mgr = fpga_mgr_create(&pdev->dev, conf->mgr_name,
+                              &altera_cvp_ops, conf);
+        if (!mgr)
+                return -ENOMEM;
+
+        pci_set_drvdata(pdev, mgr);
+
+        ret = fpga_mgr_register(mgr);
+        if (ret) {
+                fpga_mgr_free(mgr);
                 goto err_unmap;
+        }
 
         ret = driver_create_file(&altera_cvp_driver.driver,
                                  &driver_attr_chkcfg);
         if (ret) {
                 dev_err(&pdev->dev, "Can't create sysfs chkcfg file\n");
-                fpga_mgr_unregister(&pdev->dev);
+                fpga_mgr_unregister(mgr);
                 goto err_unmap;
         }
 
@@ -483,7 +492,7 @@ static void altera_cvp_remove(struct pci_dev *pdev)
         u16 cmd;
 
         driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
-        fpga_mgr_unregister(&pdev->dev);
+        fpga_mgr_unregister(mgr);
         pci_iounmap(pdev, conf->map);
         pci_release_region(pdev, CVP_BAR);
         pci_read_config_word(pdev, PCI_COMMAND, &cmd);