diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
| commit | a45216547e8925078b18b2a6b539100c3814e973 (patch) | |
| tree | fd07faaf4ad557152d71b336f9304c93075f41ed /drivers/gpu/drm/armada | |
| parent | 35dc8aabc8783d6322a59d774af2858e5955d2ab (diff) | |
| parent | 76adb460fd939756db689f238d5c2ddb45469705 (diff) | |
| download | talos-obmc-linux-a45216547e8925078b18b2a6b539100c3814e973.tar.gz talos-obmc-linux-a45216547e8925078b18b2a6b539100c3814e973.zip | |
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next
Merge Laurent's drm_platform removal code. Only conflict is with the
drm_pci.h extraction, which allows me to fix up the misplayed
drm_platform_init fumble that 0day and Stephen Rothwell reported.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/armada')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 1952e8748fea..408e00b64cf6 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -137,10 +137,9 @@ static int armada_drm_bind(struct device *dev) return ret; } - priv->drm.platformdev = to_platform_device(dev); priv->drm.dev_private = priv; - platform_set_drvdata(priv->drm.platformdev, &priv->drm); + dev_set_drvdata(dev, &priv->drm); INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work); INIT_KFIFO(priv->fb_unref); |
