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

Commit 278cba7e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: Remove unused default display name support 



The default display name is both unused and never set by platform data.
Remove default display name module parameter, platform data field and
runtime infrastructure.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fd07ab78

drivers/gpu/drm/omapdrm/dss/core.c

+0 −18
Original line number Diff line number Diff line
@@ -41,20 +41,8 @@ 


static struct {

	struct platform_device *pdev;



	const char *default_display_name;

} core;



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 *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)

{

	struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
@@ -175,7 +163,6 @@ static void dss_disable_all_devices(void) 


static int __init omap_dss_probe(struct platform_device *pdev)

{

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

	int r;



	core.pdev = pdev;
@@ -186,11 +173,6 @@ static int __init omap_dss_probe(struct platform_device *pdev) 
	if (r)

		goto err_debugfs;



	if (def_disp_name)

		core.default_display_name = def_disp_name;

	else if (pdata->default_display_name)

		core.default_display_name = pdata->default_display_name;



	return 0;



err_debugfs:

drivers/gpu/drm/omapdrm/dss/omapdss.h

+0 −1
Original line number Diff line number Diff line
@@ -781,7 +781,6 @@ void omap_dss_put_device(struct omap_dss_device *dssdev); 
struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);

struct omap_dss_device *omap_dss_find_device(void *data,

		int (*match)(struct omap_dss_device *dssdev, void *data));

const char *omapdss_get_default_display_name(void);



int dss_feat_get_num_mgrs(void);

int dss_feat_get_num_ovls(void);

drivers/video/fbdev/omap2/omapfb/dss/core.c

+0 −2
Original line number Diff line number Diff line
@@ -206,8 +206,6 @@ static int __init omap_dss_probe(struct platform_device *pdev) 


	if (def_disp_name)

		core.default_display_name = def_disp_name;

	else if (pdata->default_display_name)

		core.default_display_name = pdata->default_display_name;



	register_pm_notifier(&omap_dss_pm_notif_block);

include/linux/platform_data/omapdss.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ enum omapdss_version { 


/* Board specific data */

struct omap_dss_board_info {

	const char *default_display_name;

	int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);

	void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);

	int (*set_min_bus_tput)(struct device *dev, unsigned long r);