Commit afb0ff78 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/fb-helper: Rename drm_fb_helper_unregister_fbi() to use _info postfix 



Rename drm_fb_helper_unregister_fbi() to drm_fb_helper_unregister_info()
as part of unifying the naming within fbdev helpers. Adapt drivers. No
functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221103151446.2638-15-tzimmermann@suse.de
parent 7fd50bc3

drivers/gpu/drm/armada/armada_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void armada_fbdev_fini(struct drm_device *dev) 
	struct drm_fb_helper *fbh = priv->fbdev;



	if (fbh) {

		drm_fb_helper_unregister_fbi(fbh);

		drm_fb_helper_unregister_info(fbh);



		drm_fb_helper_fini(fbh);

drivers/gpu/drm/drm_fb_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -612,19 +612,19 @@ struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper) 
EXPORT_SYMBOL(drm_fb_helper_alloc_info);



/**

 * drm_fb_helper_unregister_fbi - unregister fb_info framebuffer device

 * drm_fb_helper_unregister_info - unregister fb_info framebuffer device

 * @fb_helper: driver-allocated fbdev helper, can be NULL

 *

 * A wrapper around unregister_framebuffer, to release the fb_info

 * framebuffer device. This must be called before releasing all resources for

 * @fb_helper by calling drm_fb_helper_fini().

 */

void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)

void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)

{

	if (fb_helper && fb_helper->info)

		unregister_framebuffer(fb_helper->info);

}

EXPORT_SYMBOL(drm_fb_helper_unregister_fbi);

EXPORT_SYMBOL(drm_fb_helper_unregister_info);



/**

 * drm_fb_helper_fini - finialize a &struct drm_fb_helper
@@ -2497,7 +2497,7 @@ static void drm_fbdev_client_unregister(struct drm_client_dev *client) 


	if (fb_helper->info)

		/* drm_fbdev_fb_destroy() takes care of cleanup */

		drm_fb_helper_unregister_fbi(fb_helper);

		drm_fb_helper_unregister_info(fb_helper);

	else

		drm_fbdev_release(fb_helper);

}

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev, 
			drm_framebuffer_remove(fb);

	}



	drm_fb_helper_unregister_fbi(fb_helper);

	drm_fb_helper_unregister_info(fb_helper);



	drm_fb_helper_fini(fb_helper);

}

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static int psb_fbdev_destroy(struct drm_device *dev, 
{

	struct drm_framebuffer *fb = fb_helper->fb;



	drm_fb_helper_unregister_fbi(fb_helper);

	drm_fb_helper_unregister_info(fb_helper);



	drm_fb_helper_fini(fb_helper);

	drm_framebuffer_unregister_private(fb);

drivers/gpu/drm/i915/display/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ void intel_fbdev_unregister(struct drm_i915_private *dev_priv) 
	if (!current_is_async())

		intel_fbdev_sync(ifbdev);



	drm_fb_helper_unregister_fbi(&ifbdev->helper);

	drm_fb_helper_unregister_info(&ifbdev->helper);

}



void intel_fbdev_fini(struct drm_i915_private *dev_priv)