Message ID | 20180712152639.30934-1-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
2018-07-12 17:26 GMT+02:00 Thomas Zimmermann <tzimmermann@suse.de>: > 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> > Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Applied on drm-misc-next. Thanks, Benjamin > --- > drivers/gpu/drm/sti/sti_drv.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c > index 90c46b49c931..832fc43960ee 100644 > --- a/drivers/gpu/drm/sti/sti_drv.c > +++ b/drivers/gpu/drm/sti/sti_drv.c > @@ -224,7 +224,7 @@ static int sti_bind(struct device *dev) > > ret = sti_init(ddev); > if (ret) > - goto err_drm_dev_unref; > + goto err_drm_dev_put; > > ret = component_bind_all(ddev->dev, ddev); > if (ret) > @@ -248,8 +248,8 @@ static int sti_bind(struct device *dev) > drm_mode_config_cleanup(ddev); > err_cleanup: > sti_cleanup(ddev); > -err_drm_dev_unref: > - drm_dev_unref(ddev); > +err_drm_dev_put: > + drm_dev_put(ddev); > return ret; > } > > @@ -259,7 +259,7 @@ static void sti_unbind(struct device *dev) > > drm_dev_unregister(ddev); > sti_cleanup(ddev); > - drm_dev_unref(ddev); > + drm_dev_put(ddev); > } > > static const struct component_master_ops sti_ops = { > -- > 2.18.0 >
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 90c46b49c931..832fc43960ee 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -224,7 +224,7 @@ static int sti_bind(struct device *dev) ret = sti_init(ddev); if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret = component_bind_all(ddev->dev, ddev); if (ret) @@ -248,8 +248,8 @@ static int sti_bind(struct device *dev) drm_mode_config_cleanup(ddev); err_cleanup: sti_cleanup(ddev); -err_drm_dev_unref: - drm_dev_unref(ddev); +err_drm_dev_put: + drm_dev_put(ddev); return ret; } @@ -259,7 +259,7 @@ static void sti_unbind(struct device *dev) drm_dev_unregister(ddev); sti_cleanup(ddev); - drm_dev_unref(ddev); + drm_dev_put(ddev); } static const struct component_master_ops sti_ops = {