drm/atmel-hlcdc: use drmm_universal_plane_alloc()

Use the drmm_universal_plane_alloc() helper to simplify the code. Using
it, we no longer need to register the destroy callback for
drm_plane_funcs.

Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Reviewed-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Link: https://patch.msgid.link/20251218-lcd_cleanup_mainline-v2-7-df837aba878f@microchip.com
Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 92132be9823f1e705d266f9547702ea9530bd043..c1f3aaae29fb9f6b947f81e2fb4e7a61e10ac5d9 100644 (file)
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -1225,7 +1225,6 @@ static void atmel_hlcdc_plane_atomic_destroy_state(struct drm_plane *p,
 static const struct drm_plane_funcs layer_plane_funcs = {
        .update_plane = drm_atomic_helper_update_plane,
        .disable_plane = drm_atomic_helper_disable_plane,
-       .destroy = drm_plane_cleanup,
        .reset = atmel_hlcdc_plane_reset,
        .atomic_duplicate_state = atmel_hlcdc_plane_atomic_duplicate_state,
        .atomic_destroy_state = atmel_hlcdc_plane_atomic_destroy_state,
@@ -1239,12 +1238,6 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev,
        enum drm_plane_type type;
        int ret;
 
-       plane = devm_kzalloc(dev->dev, sizeof(*plane), GFP_KERNEL);
-       if (!plane)
-               return -ENOMEM;
-
-       atmel_hlcdc_layer_init(&plane->layer, desc, dc->hlcdc->regmap);
-
        if (desc->type == ATMEL_HLCDC_BASE_LAYER)
                type = DRM_PLANE_TYPE_PRIMARY;
        else if (desc->type == ATMEL_HLCDC_CURSOR_LAYER)
@@ -1252,13 +1245,13 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev,
        else
                type = DRM_PLANE_TYPE_OVERLAY;
 
-       ret = drm_universal_plane_init(dev, &plane->base, 0,
-                                      &layer_plane_funcs,
-                                      desc->formats->formats,
-                                      desc->formats->nformats,
-                                      NULL, type, NULL);
-       if (ret)
-               return ret;
+       plane = drmm_universal_plane_alloc(dev, struct atmel_hlcdc_plane, base, 0,
+                                          &layer_plane_funcs, desc->formats->formats,
+                                          desc->formats->nformats, NULL, type, NULL);
+       if (IS_ERR(plane))
+               return PTR_ERR(plane);
+
+       atmel_hlcdc_layer_init(&plane->layer, desc, dc->hlcdc->regmap);
 
        drm_plane_helper_add(&plane->base,
                             &atmel_hlcdc_layer_plane_helper_funcs);