Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+15 -15
+1 -1
drivers/gpu/drm/armada/armada_fbdev.c
··· 72 72 if (IS_ERR(dfb)) 73 73 return PTR_ERR(dfb); 74 74 75 - info = drm_fb_helper_alloc_fbi(fbh); 75 + info = drm_fb_helper_alloc_info(fbh); 76 76 if (IS_ERR(info)) { 77 77 ret = PTR_ERR(info); 78 78 goto err_fballoc;
+4 -4
drivers/gpu/drm/drm_fb_helper.c
··· 558 558 EXPORT_SYMBOL(drm_fb_helper_init); 559 559 560 560 /** 561 - * drm_fb_helper_alloc_fbi - allocate fb_info and some of its members 561 + * drm_fb_helper_alloc_info - allocate fb_info and some of its members 562 562 * @fb_helper: driver-allocated fbdev helper 563 563 * 564 564 * A helper to alloc fb_info and the members cmap and apertures. Called ··· 570 570 * fb_info pointer if things went okay, pointer containing error code 571 571 * otherwise 572 572 */ 573 - struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper) 573 + struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper) 574 574 { 575 575 struct device *dev = fb_helper->dev->dev; 576 576 struct fb_info *info; ··· 609 609 framebuffer_release(info); 610 610 return ERR_PTR(ret); 611 611 } 612 - EXPORT_SYMBOL(drm_fb_helper_alloc_fbi); 612 + EXPORT_SYMBOL(drm_fb_helper_alloc_info); 613 613 614 614 /** 615 615 * drm_fb_helper_unregister_fbi - unregister fb_info framebuffer device ··· 2440 2440 fb_helper->fb = buffer->fb; 2441 2441 fb = buffer->fb; 2442 2442 2443 - fbi = drm_fb_helper_alloc_fbi(fb_helper); 2443 + fbi = drm_fb_helper_alloc_info(fb_helper); 2444 2444 if (IS_ERR(fbi)) 2445 2445 return PTR_ERR(fbi); 2446 2446
+1 -1
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
··· 63 63 unsigned int size = fb->width * fb->height * fb->format->cpp[0]; 64 64 unsigned long offset; 65 65 66 - fbi = drm_fb_helper_alloc_fbi(helper); 66 + fbi = drm_fb_helper_alloc_info(helper); 67 67 if (IS_ERR(fbi)) { 68 68 DRM_DEV_ERROR(to_dma_dev(helper->dev), 69 69 "failed to allocate fb info.\n");
+1 -1
drivers/gpu/drm/gma500/framebuffer.c
··· 268 268 269 269 memset(dev_priv->vram_addr + backing->offset, 0, size); 270 270 271 - info = drm_fb_helper_alloc_fbi(fb_helper); 271 + info = drm_fb_helper_alloc_info(fb_helper); 272 272 if (IS_ERR(info)) { 273 273 ret = PTR_ERR(info); 274 274 goto err_drm_gem_object_put;
+1 -1
drivers/gpu/drm/i915/display/intel_fbdev.c
··· 254 254 goto out_unlock; 255 255 } 256 256 257 - info = drm_fb_helper_alloc_fbi(helper); 257 + info = drm_fb_helper_alloc_info(helper); 258 258 if (IS_ERR(info)) { 259 259 drm_err(&dev_priv->drm, "Failed to allocate fb_info (%pe)\n", info); 260 260 ret = PTR_ERR(info);
+1 -1
drivers/gpu/drm/msm/msm_fbdev.c
··· 93 93 goto fail; 94 94 } 95 95 96 - fbi = drm_fb_helper_alloc_fbi(helper); 96 + fbi = drm_fb_helper_alloc_info(helper); 97 97 if (IS_ERR(fbi)) { 98 98 DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n"); 99 99 ret = PTR_ERR(fbi);
+1 -1
drivers/gpu/drm/nouveau/nouveau_fbcon.c
··· 362 362 } 363 363 } 364 364 365 - info = drm_fb_helper_alloc_fbi(helper); 365 + info = drm_fb_helper_alloc_info(helper); 366 366 if (IS_ERR(info)) { 367 367 ret = PTR_ERR(info); 368 368 goto out_unlock;
+1 -1
drivers/gpu/drm/omapdrm/omap_fbdev.c
··· 161 161 goto fail; 162 162 } 163 163 164 - fbi = drm_fb_helper_alloc_fbi(helper); 164 + fbi = drm_fb_helper_alloc_info(helper); 165 165 if (IS_ERR(fbi)) { 166 166 dev_err(dev->dev, "failed to allocate fb info\n"); 167 167 ret = PTR_ERR(fbi);
+1 -1
drivers/gpu/drm/radeon/radeon_fb.c
··· 243 243 rbo = gem_to_radeon_bo(gobj); 244 244 245 245 /* okay we have an object now allocate the framebuffer */ 246 - info = drm_fb_helper_alloc_fbi(helper); 246 + info = drm_fb_helper_alloc_info(helper); 247 247 if (IS_ERR(info)) { 248 248 ret = PTR_ERR(info); 249 249 goto out;
+1 -1
drivers/gpu/drm/tegra/fb.c
··· 243 243 if (IS_ERR(bo)) 244 244 return PTR_ERR(bo); 245 245 246 - info = drm_fb_helper_alloc_fbi(helper); 246 + info = drm_fb_helper_alloc_info(helper); 247 247 if (IS_ERR(info)) { 248 248 dev_err(drm->dev, "failed to allocate framebuffer info\n"); 249 249 drm_gem_object_put(&bo->gem);
+2 -2
include/drm/drm_fb_helper.h
··· 222 222 223 223 int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper); 224 224 225 - struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper); 225 + struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper); 226 226 void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper); 227 227 void drm_fb_helper_fill_info(struct fb_info *info, 228 228 struct drm_fb_helper *fb_helper, ··· 320 320 } 321 321 322 322 static inline struct fb_info * 323 - drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper) 323 + drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper) 324 324 { 325 325 return NULL; 326 326 }