With the introduction of dynamic connectors we will have two way of initializing a VKMS connector. Rename the current function to clarify the case.
Signed-off-by: Louis Chauvet <[email protected]> --- drivers/gpu/drm/vkms/vkms_connector.c | 4 ++-- drivers/gpu/drm/vkms/vkms_connector.h | 7 ++++--- drivers/gpu/drm/vkms/vkms_output.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/vkms_connector.c index 699b6779a46c..1b7ccca2abc0 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.c +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -108,8 +108,8 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = { .best_encoder = vkms_conn_best_encoder, }; -struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev, - struct vkms_config_connector *connector_cfg) +struct vkms_connector *vkms_connector_init_static(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg) { struct drm_device *dev = &vkmsdev->drm; struct vkms_connector *connector; diff --git a/drivers/gpu/drm/vkms/vkms_connector.h b/drivers/gpu/drm/vkms/vkms_connector.h index a124c5403697..85f9082c710e 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.h +++ b/drivers/gpu/drm/vkms/vkms_connector.h @@ -4,6 +4,7 @@ #define _VKMS_CONNECTOR_H_ #include "vkms_drv.h" +#include "vkms_config.h" #define drm_connector_to_vkms_connector(target) \ container_of(target, struct vkms_connector, base) @@ -18,14 +19,14 @@ struct vkms_connector { }; /** - * vkms_connector_init() - Initialize a connector + * vkms_connector_init_static() - Initialize a connector * @vkmsdev: VKMS device containing the connector * * Returns: * The connector or an error on failure. */ -struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev, - struct vkms_config_connector *connector_cfg); +struct vkms_connector *vkms_connector_init_static(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg); /** * vkms_trigger_connector_hotplug() - Update the device's connectors status diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 217f054d9598..44f8f53c9194 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -92,11 +92,11 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } - vkms_config_for_each_connector(vkmsdev->config, connector_cfg) { + vkms_config_for_each_connector_static(vkmsdev->config, connector_cfg) { struct vkms_config_encoder *possible_encoder; unsigned long idx = 0; - connector_cfg->connector = vkms_connector_init(vkmsdev, connector_cfg); + connector_cfg->connector = vkms_connector_init_static(vkmsdev, connector_cfg); if (IS_ERR(connector_cfg->connector)) { DRM_ERROR("Failed to init connector\n"); return PTR_ERR(connector_cfg->connector); -- 2.51.0
