Commit 2dea2d11 authored by Pankaj Bharadiya's avatar Pankaj Bharadiya Committed by Daniel Vetter
Browse files

drm: Remove unused arg from drm_fb_helper_init 



The max connector argument for drm_fb_helper_init() isn't used anymore
hence remove it.

All the drm_fb_helper_init() calls are modified with below sementic
patch.

@@
expression E1, E2, E3;
@@
-  drm_fb_helper_init(E1,E2, E3)
+  drm_fb_helper_init(E1,E2)

Signed-off-by: default avatarPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305120434.111091-2-pankaj.laxminarayan.bharadiya@intel.com
parent 0be38b10

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+1 −2
Original line number Diff line number Diff line
@@ -336,8 +336,7 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev) 
	drm_fb_helper_prepare(adev->ddev, &rfbdev->helper,

			&amdgpu_fb_helper_funcs);



	ret = drm_fb_helper_init(adev->ddev, &rfbdev->helper,

				 AMDGPUFB_CONN_LIMIT);

	ret = drm_fb_helper_init(adev->ddev, &rfbdev->helper);

	if (ret) {

		kfree(rfbdev);

		return ret;

drivers/gpu/drm/armada/armada_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int armada_fbdev_init(struct drm_device *dev) 


	drm_fb_helper_prepare(dev, fbh, &armada_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, fbh, 1);

	ret = drm_fb_helper_init(dev, fbh);

	if (ret) {

		DRM_ERROR("failed to initialize drm fb helper\n");

		goto err_fb_helper;

drivers/gpu/drm/drm_fb_helper.c

+2 −4
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ EXPORT_SYMBOL(drm_fb_helper_prepare); 
 * drm_fb_helper_init - initialize a &struct drm_fb_helper

 * @dev: drm device

 * @fb_helper: driver-allocated fbdev helper structure to initialize

 * @max_conn_count: max connector count (not used)

 *

 * This allocates the structures for the fbdev helper with the given limits.

 * Note that this won't yet touch the hardware (through the driver interfaces)
@@ -463,8 +462,7 @@ EXPORT_SYMBOL(drm_fb_helper_prepare); 
 * Zero if everything went ok, nonzero otherwise.

 */

int drm_fb_helper_init(struct drm_device *dev,

		       struct drm_fb_helper *fb_helper,

		       int max_conn_count)

		       struct drm_fb_helper *fb_helper)

{

	int ret;
@@ -2125,7 +2123,7 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client) 


	drm_fb_helper_prepare(dev, fb_helper, &drm_fb_helper_generic_funcs);



	ret = drm_fb_helper_init(dev, fb_helper, 0);

	ret = drm_fb_helper_init(dev, fb_helper);

	if (ret)

		goto err;

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int exynos_drm_fbdev_init(struct drm_device *dev) 


	drm_fb_helper_prepare(dev, helper, &exynos_drm_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, helper, MAX_CONNECTOR);

	ret = drm_fb_helper_init(dev, helper);

	if (ret < 0) {

		DRM_DEV_ERROR(dev->dev,

			      "failed to initialize drm fb helper.\n");

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ int psb_fbdev_init(struct drm_device *dev) 


	drm_fb_helper_prepare(dev, fb_helper, &psb_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, fb_helper, INTELFB_CONN_LIMIT);

	ret = drm_fb_helper_init(dev, fb_helper);

	if (ret)

		goto free;

CRA Git | Maintained and supported by SUSTech CRA and CCSE