lkml.org 
[lkml]   [2020]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 48/80] drm/vc4: hdmi: Remove vc4_dev hdmi pointer
    Date
    Now that we don't have any users anymore, we can kill that pointer.

    Reviewed-by: Eric Anholt <eric@anholt.net>
    Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
    Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
    Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/vc4/vc4_drv.h | 1 -
    drivers/gpu/drm/vc4/vc4_hdmi.c | 7 -------
    2 files changed, 8 deletions(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
    index 1a97545b9244..501a48a714d3 100644
    --- a/drivers/gpu/drm/vc4/vc4_drv.h
    +++ b/drivers/gpu/drm/vc4/vc4_drv.h
    @@ -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;
    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index e0dc823c622a..912560d58448 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -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 = {
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2020-09-03 10:10    [W:2.896 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site