Commit 36c61ae2 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tomi Valkeinen

drm/omap: dss: Remove display ordering from dss/display.c

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent eb5bc1f9
...@@ -41,7 +41,6 @@ static int disp_num_counter; ...@@ -41,7 +41,6 @@ static int disp_num_counter;
int omapdss_register_display(struct omap_dss_device *dssdev) int omapdss_register_display(struct omap_dss_device *dssdev)
{ {
struct omap_dss_driver *drv = dssdev->driver; struct omap_dss_driver *drv = dssdev->driver;
struct list_head *cur;
int id; int id;
/* /*
...@@ -54,26 +53,18 @@ int omapdss_register_display(struct omap_dss_device *dssdev) ...@@ -54,26 +53,18 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
dssdev->alias_id = id; dssdev->alias_id = id;
snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id);
/* Use 'label' property for name, if it exists */ /* Use 'label' property for name, if it exists */
of_property_read_string(dssdev->dev->of_node, "label", &dssdev->name); of_property_read_string(dssdev->dev->of_node, "label", &dssdev->name);
if (dssdev->name == NULL) 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) if (drv && drv->get_timings == NULL)
drv->get_timings = omapdss_default_get_timings; drv->get_timings = omapdss_default_get_timings;
mutex_lock(&panel_list_mutex); mutex_lock(&panel_list_mutex);
list_for_each(cur, &panel_list) { list_add_tail(&dssdev->panel_list, &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);
mutex_unlock(&panel_list_mutex); mutex_unlock(&panel_list_mutex);
return 0; return 0;
} }
......
...@@ -465,8 +465,6 @@ struct omap_dss_device { ...@@ -465,8 +465,6 @@ struct omap_dss_device {
struct list_head panel_list; struct list_head panel_list;
/* alias in the form of "display%d" */
char alias[16];
unsigned int alias_id; unsigned int alias_id;
enum omap_display_type type; enum omap_display_type type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment