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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221103151446.2638-14-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index 38f5170..eaae98d 100644 (file)
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -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;

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 480bf4f..881e6a0 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -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 @@ err_release:
        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);
 

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 767afd2..8741eb0 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -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");

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 5f502a0..6d0e3bf 100644 (file)
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index d533ecd..05b8413 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -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);

diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index b373e30..4d9a0fc 100644 (file)
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -93,7 +93,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
                goto fail;
        }
 
-       fbi = drm_fb_helper_alloc_fbi(helper);
+       fbi = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(fbi)) {
                DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n");
                ret = PTR_ERR(fbi);

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index ac4bd52..fca4012 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -362,7 +362,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
                }
        }
 
-       info = drm_fb_helper_alloc_fbi(helper);
+       info = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(info)) {
                ret = PTR_ERR(info);
                goto out_unlock;

diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 92d505b..ab30c64 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -161,7 +161,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
                goto fail;
        }
 
-       fbi = drm_fb_helper_alloc_fbi(helper);
+       fbi = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(fbi)) {
                dev_err(dev->dev, "failed to allocate fb info\n");
                ret = PTR_ERR(fbi);

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index cc6754d..0c6a227 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -243,7 +243,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
        rbo = gem_to_radeon_bo(gobj);
 
        /* okay we have an object now allocate the framebuffer */
-       info = drm_fb_helper_alloc_fbi(helper);
+       info = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(info)) {
                ret = PTR_ERR(info);
                goto out;

diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index 6fe2453..a09c071 100644 (file)
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -243,7 +243,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
        if (IS_ERR(bo))
                return PTR_ERR(bo);
 
-       info = drm_fb_helper_alloc_fbi(helper);
+       info = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(info)) {
                dev_err(drm->dev, "failed to allocate framebuffer info\n");
                drm_gem_object_put(&bo->gem);

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index d83e2d8..5ec9d9c 100644 (file)
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -222,7 +222,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 
 int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
 
-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);
 void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper);
 void drm_fb_helper_fill_info(struct fb_info *info,
                             struct drm_fb_helper *fb_helper,
@@ -320,7 +320,7 @@ drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
 }
 
 static inline struct fb_info *
-drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper)
+drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper)
 {
        return NULL;
 }