Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9882876 authored Dec 09, 2015 by Ville Syrjälä Committed by Daniel Vetter Dec 11, 2015

drm: Pass 'name' to drm_crtc_init_with_planes()



Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.

I didn't convert drm_crtc_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.

@@
identifier dev, crtc, primary, cursor, funcs;
@@
 int drm_crtc_init_with_planes(struct drm_device *dev,
                               struct drm_crtc *crtc,
                               struct drm_plane *primary, struct drm_plane *cursor,
                               const struct drm_crtc_funcs *funcs
+                              ,const char *name, int DOTDOTDOT
                               )
{ ... }

@@
identifier dev, crtc, primary, cursor, funcs;
@@
 int drm_crtc_init_with_planes(struct drm_device *dev,
                               struct drm_crtc *crtc,
                               struct drm_plane *primary, struct drm_plane *cursor,
                               const struct drm_crtc_funcs *funcs
+                              ,const char *name, int DOTDOTDOT
                               );

@@
expression E1, E2, E3, E4, E5;
@@
 drm_crtc_init_with_planes(E1, E2, E3, E4, E5
+                          ,NULL
                           )

v2: Split crtc and plane changes apart
    Pass NULL for no-name instead of ""
    Leave drm_crtc_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
    Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670771-2751-1-git-send-email-ville.syrjala@linux.intel.com

parent fb9f7a6b

drivers/gpu/drm/armada/armada_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1223,7 +1223,7 @@ static int armada_drm_crtc_create(struct drm_device drm, struct device dev,
		}

		ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL,
		&armada_crtc_funcs);
		&armada_crtc_funcs, NULL);
		if (ret)
		goto err_crtc_init;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev)
		ret = drm_crtc_init_with_planes(dev, &crtc->base,
		&planes->primary->base,
		planes->cursor ? &planes->cursor->base : NULL,
		&atmel_hlcdc_crtc_funcs);
		&atmel_hlcdc_crtc_funcs, NULL);
		if (ret < 0)
		goto fail;

drivers/gpu/drm/drm_crtc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -657,6 +657,7 @@ DEFINE_WW_CLASS(crtc_ww_class);
		* @primary: Primary plane for CRTC
		* @cursor: Cursor plane for CRTC
		* @funcs: callbacks for the new CRTC
		* @name: printf style format string for the CRTC name, or NULL for default name
		*
		* Inits a new object created as base part of a driver crtc object.
		*
		@@ -666,7 +667,8 @@ DEFINE_WW_CLASS(crtc_ww_class);
		int drm_crtc_init_with_planes(struct drm_device dev, struct drm_crtc crtc,
		struct drm_plane *primary,
		struct drm_plane *cursor,
		const struct drm_crtc_funcs *funcs)
		const struct drm_crtc_funcs *funcs,
		const char *name, ...)
		{
		struct drm_mode_config *config = &dev->mode_config;
		int ret;

drivers/gpu/drm/drm_plane_helper.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,8 @@ int drm_crtc_init(struct drm_device dev, struct drm_crtc crtc,
		struct drm_plane *primary;

		primary = create_primary_plane(dev);
		return drm_crtc_init_with_planes(dev, crtc, primary, NULL, funcs);
		return drm_crtc_init_with_planes(dev, crtc, primary, NULL, funcs,
		NULL);
		}
		EXPORT_SYMBOL(drm_crtc_init);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ struct exynos_drm_crtc exynos_drm_crtc_create(struct drm_device drm_dev,
		private->crtc[pipe] = crtc;

		ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL,
		&exynos_crtc_funcs);
		&exynos_crtc_funcs, NULL);
		if (ret < 0)
		goto err_crtc;