Commit 7fd50bc3 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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



Rename drm_fb_helper_alloc_fbi() to drm_fb_helper_alloc_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-14-tzimmermann@suse.de
parent 9877d8f6

drivers/gpu/drm/armada/armada_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, 
	if (IS_ERR(dfb))

		return PTR_ERR(dfb);



	info = drm_fb_helper_alloc_fbi(fbh);

	info = drm_fb_helper_alloc_info(fbh);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto err_fballoc;

drivers/gpu/drm/drm_fb_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ int drm_fb_helper_init(struct drm_device *dev, 
EXPORT_SYMBOL(drm_fb_helper_init);



/**

 * drm_fb_helper_alloc_fbi - allocate fb_info and some of its members

 * drm_fb_helper_alloc_info - allocate fb_info and some of its members

 * @fb_helper: driver-allocated fbdev helper

 *

 * A helper to alloc fb_info and the members cmap and apertures. Called
@@ -570,7 +570,7 @@ EXPORT_SYMBOL(drm_fb_helper_init); 
 * fb_info pointer if things went okay, pointer containing error code

 * otherwise

 */

struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper)

struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper)

{

	struct device *dev = fb_helper->dev->dev;

	struct fb_info *info;
@@ -609,7 +609,7 @@ struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper) 
	framebuffer_release(info);

	return ERR_PTR(ret);

}

EXPORT_SYMBOL(drm_fb_helper_alloc_fbi);

EXPORT_SYMBOL(drm_fb_helper_alloc_info);



/**

 * drm_fb_helper_unregister_fbi - unregister fb_info framebuffer device
@@ -2440,7 +2440,7 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, 
	fb_helper->fb = buffer->fb;

	fb = buffer->fb;



	fbi = drm_fb_helper_alloc_fbi(fb_helper);

	fbi = drm_fb_helper_alloc_info(fb_helper);

	if (IS_ERR(fbi))

		return PTR_ERR(fbi);

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, 
	unsigned int size = fb->width * fb->height * fb->format->cpp[0];

	unsigned long offset;



	fbi = drm_fb_helper_alloc_fbi(helper);

	fbi = drm_fb_helper_alloc_info(helper);

	if (IS_ERR(fbi)) {

		DRM_DEV_ERROR(to_dma_dev(helper->dev),

			      "failed to allocate fb info.\n");

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper, 


	memset(dev_priv->vram_addr + backing->offset, 0, size);



	info = drm_fb_helper_alloc_fbi(fb_helper);

	info = drm_fb_helper_alloc_info(fb_helper);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto err_drm_gem_object_put;

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

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int intelfb_create(struct drm_fb_helper *helper, 
		goto out_unlock;

	}



	info = drm_fb_helper_alloc_fbi(helper);

	info = drm_fb_helper_alloc_info(helper);

	if (IS_ERR(info)) {

		drm_err(&dev_priv->drm, "Failed to allocate fb_info (%pe)\n", info);

		ret = PTR_ERR(info);