diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-09 09:19:55 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-11 03:13:10 -0500 |
commit | b0b3b7951114315d65398c27648705ca1c322faa (patch) | |
tree | 7d555fa88e918646f67b48c2bc5c507a2cf378d2 /drivers/gpu/drm/rockchip | |
parent | f98828769c8838f526703ef180b3088a714af2f9 (diff) |
drm: Pass 'name' to drm_universal_plane_init()
Done with coccinelle for the most part. It choked on
msm/mdp/mdp5/mdp5_plane.c like so:
"BAD:!!!!! enum drm_plane_type type;"
No idea how to deal with that, so I just fixed that up
by hand.
Also 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_plane_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.
@@
typedef uint32_t;
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
int drm_universal_plane_init(struct drm_device *dev,
struct drm_plane *plane,
unsigned long possible_crtcs,
const struct drm_plane_funcs *funcs,
const uint32_t *formats,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
int drm_universal_plane_init(struct drm_device *dev,
struct drm_plane *plane,
unsigned long possible_crtcs,
const struct drm_plane_funcs *funcs,
const uint32_t *formats,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4, E5, E6, E7;
@@
drm_universal_plane_init(E1, E2, E3, E4, E5, E6, E7
+ ,NULL
)
v2: Split crtc and plane changes apart
Pass NUL for no-name instead of ""
Leave drm_plane_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/1449670795-2853-1-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/rockchip')
-rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 8e89e80ec906..dd8e0860ad4e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | |||
@@ -1478,7 +1478,7 @@ static int vop_create_crtc(struct vop *vop) | |||
1478 | 0, &vop_plane_funcs, | 1478 | 0, &vop_plane_funcs, |
1479 | win_data->phy->data_formats, | 1479 | win_data->phy->data_formats, |
1480 | win_data->phy->nformats, | 1480 | win_data->phy->nformats, |
1481 | win_data->type); | 1481 | win_data->type, NULL); |
1482 | if (ret) { | 1482 | if (ret) { |
1483 | DRM_ERROR("failed to initialize plane\n"); | 1483 | DRM_ERROR("failed to initialize plane\n"); |
1484 | goto err_cleanup_planes; | 1484 | goto err_cleanup_planes; |
@@ -1515,7 +1515,7 @@ static int vop_create_crtc(struct vop *vop) | |||
1515 | &vop_plane_funcs, | 1515 | &vop_plane_funcs, |
1516 | win_data->phy->data_formats, | 1516 | win_data->phy->data_formats, |
1517 | win_data->phy->nformats, | 1517 | win_data->phy->nformats, |
1518 | win_data->type); | 1518 | win_data->type, NULL); |
1519 | if (ret) { | 1519 | if (ret) { |
1520 | DRM_ERROR("failed to initialize overlay plane\n"); | 1520 | DRM_ERROR("failed to initialize overlay plane\n"); |
1521 | goto err_cleanup_crtc; | 1521 | goto err_cleanup_crtc; |