aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2018-07-13 04:48:24 -0400
committerXinliang Liu <xinliang.liu@linaro.org>2018-09-25 23:42:03 -0400
commit45fcedae849396598aee6686318e7488e852dedf (patch)
tree55704b73030110a6b7fa64832e321a305c33089d /drivers
parent081d0571700be0c9f212f18b5c66f40e9c2e70d2 (diff)
drm/hisilicon: Replace drm_dev_unref with drm_dev_put
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c4
-rw-r--r--drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index ccecda273112..68c0c297b3a5 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -373,7 +373,7 @@ err_unload:
373err_disable: 373err_disable:
374 pci_disable_device(pdev); 374 pci_disable_device(pdev);
375err_free: 375err_free:
376 drm_dev_unref(dev); 376 drm_dev_put(dev);
377 377
378 return ret; 378 return ret;
379} 379}
@@ -384,7 +384,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)
384 384
385 drm_dev_unregister(dev); 385 drm_dev_unregister(dev);
386 hibmc_unload(dev); 386 hibmc_unload(dev);
387 drm_dev_unref(dev); 387 drm_dev_put(dev);
388} 388}
389 389
390static struct pci_device_id hibmc_pci_table[] = { 390static struct pci_device_id hibmc_pci_table[] = {
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index ddb0403f1975..e6a62d5a00a3 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -193,7 +193,7 @@ static int kirin_drm_bind(struct device *dev)
193 193
194 ret = kirin_drm_kms_init(drm_dev); 194 ret = kirin_drm_kms_init(drm_dev);
195 if (ret) 195 if (ret)
196 goto err_drm_dev_unref; 196 goto err_drm_dev_put;
197 197
198 ret = drm_dev_register(drm_dev, 0); 198 ret = drm_dev_register(drm_dev, 0);
199 if (ret) 199 if (ret)
@@ -203,8 +203,8 @@ static int kirin_drm_bind(struct device *dev)
203 203
204err_kms_cleanup: 204err_kms_cleanup:
205 kirin_drm_kms_cleanup(drm_dev); 205 kirin_drm_kms_cleanup(drm_dev);
206err_drm_dev_unref: 206err_drm_dev_put:
207 drm_dev_unref(drm_dev); 207 drm_dev_put(drm_dev);
208 208
209 return ret; 209 return ret;
210} 210}
@@ -215,7 +215,7 @@ static void kirin_drm_unbind(struct device *dev)
215 215
216 drm_dev_unregister(drm_dev); 216 drm_dev_unregister(drm_dev);
217 kirin_drm_kms_cleanup(drm_dev); 217 kirin_drm_kms_cleanup(drm_dev);
218 drm_dev_unref(drm_dev); 218 drm_dev_put(drm_dev);
219} 219}
220 220
221static const struct component_master_ops kirin_drm_ops = { 221static const struct component_master_ops kirin_drm_ops = {