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

18 files changed, 29 insertions, 22 deletions

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index cebcab560626..c3f3a7031bb1 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -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;
 
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index 9f6e234e7029..468a14f266a7 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -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;
 
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 99e7efebedda..27922bbcde35 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -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;
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 8455e996dd9c..f5a4273e71b5 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -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);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index b3ba27fd9a6b..9d30a0fa3248 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -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;
 
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
index 82a3d311e164..d8ab8f0af10c 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
@@ -175,7 +175,7 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *fsl_dev)
 
         primary = fsl_dcu_drm_primary_create_plane(fsl_dev->drm);
         ret = drm_crtc_init_with_planes(fsl_dev->drm, crtc, primary, NULL,
-                                        &fsl_dcu_drm_crtc_funcs);
+                                        &fsl_dcu_drm_crtc_funcs, NULL);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 696f7543d264..5a3370798ba3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14120,7 +14120,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
                 goto fail;
 
         ret = drm_crtc_init_with_planes(dev, &intel_crtc->base, primary,
-                                        cursor, &intel_crtc_funcs);
+                                        cursor, &intel_crtc_funcs, NULL);
         if (ret)
                 goto fail;
 
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 882cf3d4b7a8..09e20ea69419 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -373,7 +373,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
                         imx_drm_crtc->imx_drm_helper_funcs.crtc_helper_funcs);
 
         drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
-                        imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs);
+                        imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs, NULL);
 
         return 0;
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index 6ac9aa165768..28df397c3b04 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -678,7 +678,8 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
         drm_flip_work_init(&mdp4_crtc->unref_cursor_work,
                         "unref cursor", unref_cursor_worker);
 
-        drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp4_crtc_funcs);
+        drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp4_crtc_funcs,
+                                  NULL);
         drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);
         plane->crtc = crtc;
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 7f9f4ac88029..20cee5ce4071 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -797,7 +797,8 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev,
         snprintf(mdp5_crtc->name, sizeof(mdp5_crtc->name), "%s:%d",
                         pipe2name(mdp5_plane_pipe(plane)), id);
 
-        drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp5_crtc_funcs);
+        drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp5_crtc_funcs,
+                                  NULL);
 
         drm_flip_work_init(&mdp5_crtc->unref_cursor_work,
                         "unref cursor", unref_cursor_worker);
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index ad09590e8a46..2ed0754ed19e 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -524,7 +524,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
         omap_crtc->mgr = omap_dss_get_overlay_manager(channel);
 
         ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
-                                        &omap_crtc_funcs);
+                                        &omap_crtc_funcs, NULL);
         if (ret < 0) {
                 kfree(omap_crtc);
                 return NULL;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 48cb19949ca3..88a4b706be16 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -613,7 +613,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 
         ret = drm_crtc_init_with_planes(rcdu->ddev, crtc,
                                         &rgrp->planes[index % 2].plane,
-                                        NULL, &crtc_funcs);
+                                        NULL, &crtc_funcs, NULL);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 03c47eeadc81..8e89e80ec906 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1492,7 +1492,7 @@ static int vop_create_crtc(struct vop *vop)
         }
 
         ret = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
-                                        &vop_crtc_funcs);
+                                        &vop_crtc_funcs, NULL);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index 3ae09dcd4fd8..de11c7cfb02f 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -367,7 +367,7 @@ int sti_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer,
         int res;
 
         res = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
-                                        &sti_crtc_funcs);
+                                        &sti_crtc_funcs, NULL);
         if (res) {
                 DRM_ERROR("Can't initialze CRTC\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index e9f24a85a103..be894103fa49 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1732,7 +1732,7 @@ static int tegra_dc_init(struct host1x_client *client)
         }
 
         err = drm_crtc_init_with_planes(drm, &dc->base, primary, cursor,
-                                        &tegra_crtc_funcs);
+                                        &tegra_crtc_funcs, NULL);
         if (err < 0)
                 goto cleanup;
 
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 265064c62d49..2168a99d59aa 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -606,7 +606,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
         }
 
         drm_crtc_init_with_planes(drm, crtc, primary_plane, cursor_plane,
-                                  &vc4_crtc_funcs);
+                                  &vc4_crtc_funcs, NULL);
         drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);
         primary_plane->crtc = crtc;
         cursor_plane->crtc = crtc;
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index 623c98cf024d..ef4cef0c8ece 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -431,7 +431,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
         if (IS_ERR(plane))
                 return PTR_ERR(plane);
         drm_crtc_init_with_planes(dev, crtc, plane, NULL,
-                                  &virtio_gpu_crtc_funcs);
+                                  &virtio_gpu_crtc_funcs, NULL);
         drm_mode_crtc_set_gamma_size(crtc, 256);
         drm_crtc_helper_add(crtc, &virtio_gpu_crtc_helper_funcs);
         plane->crtc = crtc;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 4f587a5bc88f..f0127e7b0ee2 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -2144,11 +2144,13 @@ struct drm_prop_enum_list {
         char *name;
 };
 
-extern 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);
+extern __printf(6, 7)
+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, ...);
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
 extern unsigned int drm_crtc_index(struct drm_crtc *crtc);