drm: use dev_name as default unique name in drm_dev_alloc()

[cascardo/linux.git] / drivers / gpu / drm / atmel-hlcdc / atmel_hlcdc_dc.c

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 244df0a..a45b32b 100644 (file)
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -332,6 +332,10 @@ static const struct of_device_id atmel_hlcdc_of_match[] = {
                .compatible = "atmel,at91sam9x5-hlcdc",
                .data = &atmel_hlcdc_dc_at91sam9x5,
        },
+       {
+               .compatible = "atmel,sama5d2-hlcdc",
+               .data = &atmel_hlcdc_dc_sama5d4,
+       },
        {
                .compatible = "atmel,sama5d3-hlcdc",
                .data = &atmel_hlcdc_dc_sama5d3,
@@ -342,6 +346,7 @@ static const struct of_device_id atmel_hlcdc_of_match[] = {
        },
        { /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, atmel_hlcdc_of_match);
 
 int atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc,
                              struct drm_display_mode *mode)
@@ -402,7 +407,7 @@ static irqreturn_t atmel_hlcdc_dc_irq_handler(int irq, void *data)
 }
 
 static struct drm_framebuffer *atmel_hlcdc_fb_create(struct drm_device *dev,
-               struct drm_file *file_priv, struct drm_mode_fb_cmd2 *mode_cmd)
+               struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd)
 {
        return drm_fb_cma_create(dev, file_priv, mode_cmd);
 }
@@ -733,10 +738,6 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)
        if (!ddev)
                return -ENOMEM;
 
-       ret = drm_dev_set_unique(ddev, dev_name(ddev->dev));
-       if (ret)
-               goto err_unref;
-
        ret = atmel_hlcdc_dc_load(ddev);
        if (ret)
                goto err_unref;