Merge tag 'sound-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[~andy/linux] / drivers / gpu / drm / armada / armada_drv.c

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 62d0ff3efddf9bb5a08e1b209b5a40c6b8148e47..32982da82694be753d1072c90136d842a8a866ec 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -68,15 +68,7 @@ void __armada_drm_queue_unref_work(struct drm_device *dev,
 {
        struct armada_private *priv = dev->dev_private;
 
-       /*
-        * Yes, we really must jump through these hoops just to store a
-        * _pointer_ to something into the kfifo.  This is utterly insane
-        * and idiotic, because it kfifo requires the _data_ pointed to by
-        * the pointer const, not the pointer itself.  Not only that, but
-        * you have to pass a pointer _to_ the pointer you want stored.
-        */
-       const struct drm_framebuffer *silly_api_alert = fb;
-       WARN_ON(!kfifo_put(&priv->fb_unref, &silly_api_alert));
+       WARN_ON(!kfifo_put(&priv->fb_unref, fb));
        schedule_work(&priv->fb_unref_work);
 }
 
@@ -128,6 +120,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
                return -ENOMEM;
        }
 
+       platform_set_drvdata(dev->platformdev, dev);
        dev->dev_private = priv;
 
        /* Get the implementation specific driver data. */
@@ -381,7 +374,7 @@ static int armada_drm_probe(struct platform_device *pdev)
 
 static int armada_drm_remove(struct platform_device *pdev)
 {
-       drm_platform_exit(&armada_drm_driver, pdev);
+       drm_put_dev(platform_get_drvdata(pdev));
        return 0;
 }