OSDN Git Service

drm/hisilicon: Replace drm_dev_unref with drm_dev_put
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 13 Jul 2018 08:48:24 +0000 (10:48 +0200)
committerXinliang Liu <xinliang.liu@linaro.org>
Wed, 26 Sep 2018 03:42:03 +0000 (11:42 +0800)
This patch unifies the naming of DRM functions for reference counting
of struct drm_device. The resulting code is more aligned with the rest
of the Linux kernel interfaces.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Signed-off-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

index ccecda2..68c0c29 100644 (file)
@@ -373,7 +373,7 @@ err_unload:
 err_disable:
        pci_disable_device(pdev);
 err_free:
-       drm_dev_unref(dev);
+       drm_dev_put(dev);
 
        return ret;
 }
@@ -384,7 +384,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)
 
        drm_dev_unregister(dev);
        hibmc_unload(dev);
-       drm_dev_unref(dev);
+       drm_dev_put(dev);
 }
 
 static struct pci_device_id hibmc_pci_table[] = {
index ddb0403..e6a62d5 100644 (file)
@@ -193,7 +193,7 @@ static int kirin_drm_bind(struct device *dev)
 
        ret = kirin_drm_kms_init(drm_dev);
        if (ret)
-               goto err_drm_dev_unref;
+               goto err_drm_dev_put;
 
        ret = drm_dev_register(drm_dev, 0);
        if (ret)
@@ -203,8 +203,8 @@ static int kirin_drm_bind(struct device *dev)
 
 err_kms_cleanup:
        kirin_drm_kms_cleanup(drm_dev);
-err_drm_dev_unref:
-       drm_dev_unref(drm_dev);
+err_drm_dev_put:
+       drm_dev_put(drm_dev);
 
        return ret;
 }
@@ -215,7 +215,7 @@ static void kirin_drm_unbind(struct device *dev)
 
        drm_dev_unregister(drm_dev);
        kirin_drm_kms_cleanup(drm_dev);
-       drm_dev_unref(drm_dev);
+       drm_dev_put(drm_dev);
 }
 
 static const struct component_master_ops kirin_drm_ops = {