| Message ID | 20220610092924.754942-46-maxime@cerno.tech (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: Fix hotplug for vc4 | expand |
Am 10.06.22 um 11:29 schrieb Maxime Ripard: > There's no user for that pointer so let's just get rid of it. > > Signed-off-by: Maxime Ripard <maxime@cerno.tech> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/vc4/vc4_drv.h | 1 - > drivers/gpu/drm/vc4/vc4_txp.c | 6 ------ > 2 files changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index 846f3cda179a..5f2d7640a09d 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -80,7 +80,6 @@ struct vc4_dev { > struct vc4_hvs *hvs; > struct vc4_v3d *v3d; > struct vc4_vec *vec; > - struct vc4_txp *txp; > > struct vc4_hang_state *hang_state; > > diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c > index f306e05ac5b2..87c896f482fb 100644 > --- a/drivers/gpu/drm/vc4/vc4_txp.c > +++ b/drivers/gpu/drm/vc4/vc4_txp.c > @@ -468,7 +468,6 @@ static int vc4_txp_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_crtc *vc4_crtc; > struct vc4_txp *txp; > struct drm_crtc *crtc; > @@ -521,7 +520,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) > return ret; > > dev_set_drvdata(dev, txp); > - vc4->txp = txp; > > vc4_debugfs_add_regset32(drm, "txp_regs", &txp->regset); > > @@ -531,13 +529,9 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) > static void vc4_txp_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_txp *txp = dev_get_drvdata(dev); > > vc4_txp_connector_destroy(&txp->connector.base); > - > - vc4->txp = NULL; > } > > static const struct component_ops vc4_txp_ops = {
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index 846f3cda179a..5f2d7640a09d 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -80,7 +80,6 @@ struct vc4_dev { struct vc4_hvs *hvs; struct vc4_v3d *v3d; struct vc4_vec *vec; - struct vc4_txp *txp; struct vc4_hang_state *hang_state; diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index f306e05ac5b2..87c896f482fb 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -468,7 +468,6 @@ static int vc4_txp_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_crtc *vc4_crtc; struct vc4_txp *txp; struct drm_crtc *crtc; @@ -521,7 +520,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) return ret; dev_set_drvdata(dev, txp); - vc4->txp = txp; vc4_debugfs_add_regset32(drm, "txp_regs", &txp->regset); @@ -531,13 +529,9 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) static void vc4_txp_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_txp *txp = dev_get_drvdata(dev); vc4_txp_connector_destroy(&txp->connector.base); - - vc4->txp = NULL; } static const struct component_ops vc4_txp_ops = {
There's no user for that pointer so let's just get rid of it. Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/vc4/vc4_drv.h | 1 - drivers/gpu/drm/vc4/vc4_txp.c | 6 ------ 2 files changed, 7 deletions(-)