Unverified Commit 283d347d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Remove vc4_dev hdmi pointer 



Now that we don't have any users anymore, we can kill that pointer.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarHoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/d7ebf50319bbd902e4b7b7c39ae1612c3b38e6b2.1599120059.git-series.maxime@cerno.tech
parent 47c167b7

drivers/gpu/drm/vc4/vc4_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct vc4_perfmon { 
struct vc4_dev {

	struct drm_device *dev;



	struct vc4_hdmi *hdmi;

	struct vc4_hvs *hvs;

	struct vc4_v3d *v3d;

	struct vc4_dpi *dpi;

drivers/gpu/drm/vc4/vc4_hdmi.c

+0 −7
Original line number Diff line number Diff line
@@ -1188,7 +1188,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
#endif

	struct platform_device *pdev = to_platform_device(dev);

	struct drm_device *drm = dev_get_drvdata(master);

	struct vc4_dev *vc4 = drm->dev_private;

	struct vc4_hdmi *vc4_hdmi;

	struct drm_encoder *encoder;

	struct device_node *ddc_node;
@@ -1279,8 +1278,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
		vc4_hdmi->hpd_active_low = hpd_gpio_flags & OF_GPIO_ACTIVE_LOW;

	}



	vc4->hdmi = vc4_hdmi;



	/* HDMI core must be enabled. */

	if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) {

		HD_WRITE(VC4_HD_M_CTL, VC4_HD_M_SW_RST);
@@ -1360,8 +1357,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
static void vc4_hdmi_unbind(struct device *dev, struct device *master,

			    void *data)

{

	struct drm_device *drm = dev_get_drvdata(master);

	struct vc4_dev *vc4 = drm->dev_private;

	struct vc4_hdmi *vc4_hdmi;



	/*
@@ -1393,8 +1388,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, 
	pm_runtime_disable(dev);



	put_device(&vc4_hdmi->ddc->dev);



	vc4->hdmi = NULL;

}



static const struct component_ops vc4_hdmi_ops = {