From: Dmitry Baryshkov <[email protected]> Rename drm_writeback_connector_init_with_encoder() to drm_writeback_connector_init() and adapt its interface to follow drmm_writeback_connector_init().
v2: Correct kernel doc param order (complained by Sashiko). Reviewed-by: Suraj Kandpal <[email protected]> Reviewed-by: Louis Chauvet <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: John Harrison <[email protected]> --- drivers/gpu/drm/drm_writeback.c | 16 ++++++++-------- include/drm/drm_writeback.h | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index 683da368e339..6ba3833a93ca 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -241,13 +241,13 @@ static int __drm_writeback_connector_init(struct drm_device *dev, } /** - * drm_writeback_connector_init_with_encoder - Initialize a writeback connector with + * drm_writeback_connector_init - Initialize a writeback connector with * a custom encoder * * @dev: DRM device * @wb_connector: Writeback connector to initialize - * @enc: handle to the already initialized drm encoder * @con_funcs: Connector funcs vtable + * @enc: handle to the already initialized drm encoder * @formats: Array of supported pixel formats for the writeback engine * @n_formats: Length of the formats array * @@ -269,11 +269,11 @@ static int __drm_writeback_connector_init(struct drm_device *dev, * * Returns: 0 on success, or a negative error code */ -int drm_writeback_connector_init_with_encoder(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, - struct drm_encoder *enc, - const struct drm_connector_funcs *con_funcs, - const u32 *formats, int n_formats) +int drm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const u32 *formats, int n_formats) { struct drm_connector *connector = &wb_connector->base; int ret; @@ -290,7 +290,7 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev, return ret; } -EXPORT_SYMBOL(drm_writeback_connector_init_with_encoder); +EXPORT_SYMBOL(drm_writeback_connector_init); /** * drm_writeback_connector_cleanup - Cleanup the writeback connector diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 879ca103320c..958466a05e60 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -137,11 +137,11 @@ drm_connector_to_writeback(struct drm_connector *connector) return container_of(connector, struct drm_writeback_connector, base); } -int drm_writeback_connector_init_with_encoder(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, - struct drm_encoder *enc, - const struct drm_connector_funcs *con_funcs, const u32 *formats, - int n_formats); +int drm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const u32 *formats, int n_formats); int drmm_writeback_connector_init(struct drm_device *dev, struct drm_writeback_connector *wb_connector, -- 2.43.0
