drm: kirin: Reanme dc_ops to kirin_drm_data

As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames the
struct kirin_dc_ops to struct kirin_drm_data and cleans
up the related variable names.

Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820230626.23253-13-john.stultz@linaro.org

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index 3fbf099597c1ac13efbfb4546f4496c34b0a9bb9..4c6646dfc465e766d81dfc98b677c666ef436f7b 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -1055,7 +1055,7 @@ static void ade_drm_cleanup(struct platform_device *pdev)
 {
 }
 
-const struct kirin_dc_ops ade_dc_ops = {
+struct kirin_drm_data ade_driver_data = {
        .init = ade_drm_init,
        .cleanup = ade_drm_cleanup
 };

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index fcdd6b1e167df1697ecafaaa8e17413cf0fd3dce..3d22f944a8400e4f8e9de6580842b214bfae5e36 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -29,12 +29,12 @@
 
 #include "kirin_drm_drv.h"
 
-static struct kirin_dc_ops *dc_ops;
+static struct kirin_drm_data *driver_data;
 
 static int kirin_drm_kms_cleanup(struct drm_device *dev)
 {
        drm_kms_helper_poll_fini(dev);
-       dc_ops->cleanup(to_platform_device(dev->dev));
+       driver_data->cleanup(to_platform_device(dev->dev));
        drm_mode_config_cleanup(dev);
 
        return 0;
@@ -68,7 +68,7 @@ static int kirin_drm_kms_init(struct drm_device *dev)
        kirin_drm_mode_config_init(dev);
 
        /* display controller init */
-       ret = dc_ops->init(to_platform_device(dev->dev));
+       ret = driver_data->init(to_platform_device(dev->dev));
        if (ret)
                goto err_mode_config_cleanup;
 
@@ -99,7 +99,7 @@ static int kirin_drm_kms_init(struct drm_device *dev)
 err_unbind_all:
        component_unbind_all(dev->dev, dev);
 err_dc_cleanup:
-       dc_ops->cleanup(to_platform_device(dev->dev));
+       driver_data->cleanup(to_platform_device(dev->dev));
 err_mode_config_cleanup:
        drm_mode_config_cleanup(dev);
 
@@ -194,8 +194,8 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)
        struct component_match *match = NULL;
        struct device_node *remote;
 
-       dc_ops = (struct kirin_dc_ops *)of_device_get_match_data(dev);
-       if (!dc_ops) {
+       driver_data = (struct kirin_drm_data *)of_device_get_match_data(dev);
+       if (!driver_data) {
                DRM_ERROR("failed to get dt id data\n");
                return -EINVAL;
        }
@@ -213,13 +213,13 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)
 static int kirin_drm_platform_remove(struct platform_device *pdev)
 {
        component_master_del(&pdev->dev, &kirin_drm_ops);
-       dc_ops = NULL;
+       driver_data = NULL;
        return 0;
 }
 
 static const struct of_device_id kirin_drm_dt_ids[] = {
        { .compatible = "hisilicon,hi6220-ade",
-         .data = &ade_dc_ops,
+         .data = &ade_driver_data,
        },
        { /* end node */ },
 };

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
index d47cbb4279793b9a5872eccd9499a69ab594f857..cd2eaa653db719b13528fd62fae03e4983480398 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
@@ -34,11 +34,11 @@ struct kirin_plane {
 };
 
 /* display controller init/cleanup ops */
-struct kirin_dc_ops {
+struct kirin_drm_data {
        int (*init)(struct platform_device *pdev);
        void (*cleanup)(struct platform_device *pdev);
 };
 
-extern const struct kirin_dc_ops ade_dc_ops;
+extern struct kirin_drm_data ade_driver_data;
 
 #endif /* __KIRIN_DRM_DRV_H__ */