]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/ili9225: Use devm_drm_dev_alloc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 15 Apr 2020 07:39:54 +0000 (09:39 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Apr 2020 13:48:20 +0000 (15:48 +0200)
Already using devm_drm_dev_init, so very simple replacment.

Acked-by: David Lechner <david@lechnology.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: David Lechner <david@lechnology.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-20-daniel.vetter@ffwll.ch
drivers/gpu/drm/tiny/ili9225.c

index 118477af449114babc08b5bf6e7f2c56e1df8aea..d1a5ab6747d5cd8012d3c1876ffbf3f57aea82cf 100644 (file)
@@ -376,18 +376,13 @@ static int ili9225_probe(struct spi_device *spi)
        u32 rotation = 0;
        int ret;
 
-       dbidev = kzalloc(sizeof(*dbidev), GFP_KERNEL);
-       if (!dbidev)
-               return -ENOMEM;
+       dbidev = devm_drm_dev_alloc(dev, &ili9225_driver,
+                                   struct mipi_dbi_dev, drm);
+       if (IS_ERR(dbidev))
+               return PTR_ERR(dbidev);
 
        dbi = &dbidev->dbi;
        drm = &dbidev->drm;
-       ret = devm_drm_dev_init(dev, drm, &ili9225_driver);
-       if (ret) {
-               kfree(dbidev);
-               return ret;
-       }
-       drmm_add_final_kfree(drm, dbidev);
 
        dbi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
        if (IS_ERR(dbi->reset)) {