Hi,
On Sat, May 26, 2018 at 08:24:22PM +0300, Laurent Pinchart wrote:
> From: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
>
> As ordering of the dss_devices based on DT aliases is now implemented in
> omap_drm.c, there is no need to do the ordering in dss/display.c
> anymore.
>
> At the same time remove the alias member of the omap_dss_device struct
> since it is no longer needed. The only place it was used is in the
> omapdss_register_display() function.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>
-- Sebastian
> Changes since v0:
>
> - Use %u to format display ID
> ---
> drivers/gpu/drm/omapdrm/dss/display.c | 15 +++------------
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 --
> 2 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
> index 3ef99f344bd3..25c3be86d7f4 100644
> --- a/drivers/gpu/drm/omapdrm/dss/display.c
> +++ b/drivers/gpu/drm/omapdrm/dss/display.c
> @@ -41,7 +41,6 @@ static int disp_num_counter;
> int omapdss_register_display(struct omap_dss_device *dssdev)
> {
> struct omap_dss_driver *drv = dssdev->driver;
> - struct list_head *cur;
> int id;
>
> /*
> @@ -54,26 +53,18 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
>
> dssdev->alias_id = id;
>
> - snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id);
> -
> /* Use 'label' property for name, if it exists */
> of_property_read_string(dssdev->dev->of_node, "label", &dssdev->name);
>
> if (dssdev->name == NULL)
> - dssdev->name = dssdev->alias;
> + dssdev->name = devm_kasprintf(dssdev->dev, GFP_KERNEL,
> + "display%u", id);
>
> if (drv && drv->get_timings == NULL)
> drv->get_timings = omapdss_default_get_timings;
>
> mutex_lock(&panel_list_mutex);
> - list_for_each(cur, &panel_list) {
> - struct omap_dss_device *ldev = list_entry(cur,
> - struct omap_dss_device,
> - panel_list);
> - if (strcmp(ldev->alias, dssdev->alias) > 0)
> - break;
> - }
> - list_add_tail(&dssdev->panel_list, cur);
> + list_add_tail(&dssdev->panel_list, &panel_list);
> mutex_unlock(&panel_list_mutex);
> return 0;
> }
> diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> index eae105b0b961..8d530057a4b9 100644
> --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> @@ -465,8 +465,6 @@ struct omap_dss_device {
>
> struct list_head panel_list;
>
> - /* alias in the form of "display%d" */
> - char alias[16];
> unsigned int alias_id;
>
> enum omap_display_type type;
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
