drm/vc4: vec: Remove vc4_dev vec pointer

There's no user for that pointer so let's just get rid of it.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-55-maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 0eb5f8a669fe295295f80c81f2e4afc9a4728c0f..b7ccdc2b09de1e967f24d18a196aa9fbee88d578 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -84,7 +84,6 @@ struct vc4_dev {
 
        struct vc4_hvs *hvs;
        struct vc4_v3d *v3d;
-       struct vc4_vec *vec;
 
        struct vc4_hang_state *hang_state;
 

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 11fc3d6f66b1ec5c9c3ff2873f3a21a1cb1cbe68..99fe40c8cf81fc704ac93145c0992a5d13b82b8c 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -532,7 +532,6 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm = dev_get_drvdata(master);
-       struct vc4_dev *vc4 = to_vc4_dev(drm);
        struct vc4_vec *vec;
        struct vc4_vec_encoder *vc4_vec_encoder;
        int ret;
@@ -585,8 +584,6 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
 
        dev_set_drvdata(dev, vec);
 
-       vc4->vec = vec;
-
        vc4_debugfs_add_regset32(drm, "vec_regs", &vec->regset);
 
        return 0;
@@ -601,15 +598,11 @@ err_destroy_encoder:
 static void vc4_vec_unbind(struct device *dev, struct device *master,
                           void *data)
 {
-       struct drm_device *drm = dev_get_drvdata(master);
-       struct vc4_dev *vc4 = to_vc4_dev(drm);
        struct vc4_vec *vec = dev_get_drvdata(dev);
 
        vc4_vec_connector_destroy(vec->connector);
        drm_encoder_cleanup(vec->encoder);
        pm_runtime_disable(dev);
-
-       vc4->vec = NULL;
 }
 
 static const struct component_ops vc4_vec_ops = {