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

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
...@@ -72,7 +72,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, ...@@ -72,7 +72,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
if (IS_ERR(dfb)) if (IS_ERR(dfb))
return PTR_ERR(dfb); return PTR_ERR(dfb);
info = drm_fb_helper_alloc_fbi(fbh); info = drm_fb_helper_alloc_info(fbh);
if (IS_ERR(info)) { if (IS_ERR(info)) {
ret = PTR_ERR(info); ret = PTR_ERR(info);
goto err_fballoc; goto err_fballoc;
......
...@@ -558,7 +558,7 @@ int drm_fb_helper_init(struct drm_device *dev, ...@@ -558,7 +558,7 @@ int drm_fb_helper_init(struct drm_device *dev,
EXPORT_SYMBOL(drm_fb_helper_init); 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 * @fb_helper: driver-allocated fbdev helper
* *
* A helper to alloc fb_info and the members cmap and apertures. Called * A helper to alloc fb_info and the members cmap and apertures. Called
...@@ -570,7 +570,7 @@ EXPORT_SYMBOL(drm_fb_helper_init); ...@@ -570,7 +570,7 @@ EXPORT_SYMBOL(drm_fb_helper_init);
* fb_info pointer if things went okay, pointer containing error code * fb_info pointer if things went okay, pointer containing error code
* otherwise * 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 device *dev = fb_helper->dev->dev;
struct fb_info *info; struct fb_info *info;
...@@ -609,7 +609,7 @@ struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper) ...@@ -609,7 +609,7 @@ struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper)
framebuffer_release(info); framebuffer_release(info);
return ERR_PTR(ret); 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 * 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, ...@@ -2440,7 +2440,7 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
fb_helper->fb = buffer->fb; fb_helper->fb = buffer->fb;
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)) if (IS_ERR(fbi))
return PTR_ERR(fbi); return PTR_ERR(fbi);
......
...@@ -63,7 +63,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, ...@@ -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 int size = fb->width * fb->height * fb->format->cpp[0];
unsigned long offset; unsigned long offset;
fbi = drm_fb_helper_alloc_fbi(helper); fbi = drm_fb_helper_alloc_info(helper);
if (IS_ERR(fbi)) { if (IS_ERR(fbi)) {
DRM_DEV_ERROR(to_dma_dev(helper->dev), DRM_DEV_ERROR(to_dma_dev(helper->dev),
"failed to allocate fb info.\n"); "failed to allocate fb info.\n");
......
...@@ -268,7 +268,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper, ...@@ -268,7 +268,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper,
memset(dev_priv->vram_addr + backing->offset, 0, size); 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)) { if (IS_ERR(info)) {
ret = PTR_ERR(info); ret = PTR_ERR(info);
goto err_drm_gem_object_put; goto err_drm_gem_object_put;
......
...@@ -254,7 +254,7 @@ static int intelfb_create(struct drm_fb_helper *helper, ...@@ -254,7 +254,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
goto out_unlock; goto out_unlock;
} }
info = drm_fb_helper_alloc_fbi(helper); info = drm_fb_helper_alloc_info(helper);
if (IS_ERR(info)) { if (IS_ERR(info)) {
drm_err(&dev_priv->drm, "Failed to allocate fb_info (%pe)\n", info); drm_err(&dev_priv->drm, "Failed to allocate fb_info (%pe)\n", info);
ret = PTR_ERR(info); ret = PTR_ERR(info);
......
...@@ -93,7 +93,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, ...@@ -93,7 +93,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
goto fail; goto fail;
} }
fbi = drm_fb_helper_alloc_fbi(helper); fbi = drm_fb_helper_alloc_info(helper);
if (IS_ERR(fbi)) { if (IS_ERR(fbi)) {
DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n"); DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n");
ret = PTR_ERR(fbi); ret = PTR_ERR(fbi);
......
...@@ -362,7 +362,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, ...@@ -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)) { if (IS_ERR(info)) {
ret = PTR_ERR(info); ret = PTR_ERR(info);
goto out_unlock; goto out_unlock;
......
...@@ -161,7 +161,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, ...@@ -161,7 +161,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
goto fail; goto fail;
} }
fbi = drm_fb_helper_alloc_fbi(helper); fbi = drm_fb_helper_alloc_info(helper);
if (IS_ERR(fbi)) { if (IS_ERR(fbi)) {
dev_err(dev->dev, "failed to allocate fb info\n"); dev_err(dev->dev, "failed to allocate fb info\n");
ret = PTR_ERR(fbi); ret = PTR_ERR(fbi);
......
...@@ -243,7 +243,7 @@ static int radeonfb_create(struct drm_fb_helper *helper, ...@@ -243,7 +243,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
rbo = gem_to_radeon_bo(gobj); rbo = gem_to_radeon_bo(gobj);
/* okay we have an object now allocate the framebuffer */ /* 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)) { if (IS_ERR(info)) {
ret = PTR_ERR(info); ret = PTR_ERR(info);
goto out; goto out;
......
...@@ -243,7 +243,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper, ...@@ -243,7 +243,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
if (IS_ERR(bo)) if (IS_ERR(bo))
return PTR_ERR(bo); return PTR_ERR(bo);
info = drm_fb_helper_alloc_fbi(helper); info = drm_fb_helper_alloc_info(helper);
if (IS_ERR(info)) { if (IS_ERR(info)) {
dev_err(drm->dev, "failed to allocate framebuffer info\n"); dev_err(drm->dev, "failed to allocate framebuffer info\n");
drm_gem_object_put(&bo->gem); drm_gem_object_put(&bo->gem);
......
...@@ -222,7 +222,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, ...@@ -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); 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_unregister_fbi(struct drm_fb_helper *fb_helper);
void drm_fb_helper_fill_info(struct fb_info *info, void drm_fb_helper_fill_info(struct fb_info *info,
struct drm_fb_helper *fb_helper, struct drm_fb_helper *fb_helper,
...@@ -320,7 +320,7 @@ drm_fb_helper_restore_fbdev_mode_unlocked(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 * 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; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment