Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bbcce5e authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: export dss_get_def_display_name() 



Export dss_get_def_display_name() with the name of
omapdss_get_def_display_name() so that omapfb can use it after the next
patch which moves default display handling to omapfb.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c31cba8a

drivers/video/omap2/dss/core.c

+2 −1
Original line number Diff line number Diff line
@@ -53,10 +53,11 @@ static char *def_disp_name; 
module_param_named(def_disp, def_disp_name, charp, 0);

MODULE_PARM_DESC(def_disp, "default display name");



const char *dss_get_default_display_name(void)

const char *omapdss_get_default_display_name(void)

{

	return core.default_display_name;

}

EXPORT_SYMBOL(omapdss_get_default_display_name);



enum omapdss_version omapdss_get_version(void)

{

drivers/video/omap2/dss/display.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ int dss_init_device(struct platform_device *pdev, 
{

	struct device_attribute *attr;

	int i, r;

	const char *def_disp_name = dss_get_default_display_name();

	const char *def_disp_name = omapdss_get_default_display_name();

	bool force;



	force = def_disp_name && strcmp(def_disp_name, dssdev->name) == 0;

drivers/video/omap2/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev) 
static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	const char *def_disp_name = dss_get_default_display_name();

	const char *def_disp_name = omapdss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -5100,7 +5100,7 @@ static struct omap_dss_device * __init dsi_find_dssdev(struct platform_device *p 
{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	struct dsi_data *dsi = dsi_get_dsidrv_data(pdev);

	const char *def_disp_name = dss_get_default_display_name();

	const char *def_disp_name = omapdss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;

drivers/video/omap2/dss/dss.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct seq_file; 
struct platform_device;



/* core */

const char *dss_get_default_display_name(void);

struct bus_type *dss_get_bus(void);

struct regulator *dss_get_vdds_dsi(void);

struct regulator *dss_get_vdds_sdi(void);