diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-04 03:03:34 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-04 03:03:34 +0200 |
| commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
| tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /drivers/gpu/drm/drm_panel.c | |
| parent | Merge tag 'exynos-drm-next-for-v4.20' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.xz linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.zip | |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_panel.c')
| -rw-r--r-- | drivers/gpu/drm/drm_panel.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index 0db486d10d1c..c33f95e08e1b 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -24,7 +24,6 @@ #include <linux/err.h> #include <linux/module.h> -#include <drm/drm_device.h> #include <drm/drm_crtc.h> #include <drm/drm_panel.h> @@ -105,13 +104,6 @@ int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector) if (panel->connector) return -EBUSY; - panel->link = device_link_add(connector->dev->dev, panel->dev, 0); - if (!panel->link) { - dev_err(panel->dev, "failed to link panel to %s\n", - dev_name(connector->dev->dev)); - return -EINVAL; - } - panel->connector = connector; panel->drm = connector->dev; @@ -133,8 +125,6 @@ EXPORT_SYMBOL(drm_panel_attach); */ int drm_panel_detach(struct drm_panel *panel) { - device_link_del(panel->link); - panel->connector = NULL; panel->drm = NULL; |