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

Commit ac851bf1 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Daniel Vetter
Browse files

drm: sti: remove useless call to dev->struct_mutex 



No need to protect debugfs functions with dev->struct_mutex

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1464630800-30786-19-git-send-email-daniel.vetter@ffwll.ch
parent bd884b74

drivers/gpu/drm/sti/sti_cursor.c

+0 −7
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ static int cursor_dbg_show(struct seq_file *s, void *data) 
{

	struct drm_info_node *node = s->private;

	struct sti_cursor *cursor = (struct sti_cursor *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	seq_printf(s, "%s: (vaddr = 0x%p)",

		   sti_plane_to_str(&cursor->plane), cursor->regs);
@@ -129,7 +123,6 @@ static int cursor_dbg_show(struct seq_file *s, void *data) 
	DBGFS_DUMP(CUR_AWE);

	seq_puts(s, "\n");



	mutex_unlock(&dev->struct_mutex);

	return 0;

}

drivers/gpu/drm/sti/sti_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -72,11 +72,6 @@ static int sti_drm_fps_dbg_show(struct seq_file *s, void *data) 
	struct drm_info_node *node = s->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_plane *p;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	list_for_each_entry(p, &dev->mode_config.plane_list, head) {

		struct sti_plane *plane = to_sti_plane(p);
@@ -86,7 +81,6 @@ static int sti_drm_fps_dbg_show(struct seq_file *s, void *data) 
			   plane->fps_info.fips_str);

	}



	mutex_unlock(&dev->struct_mutex);

	return 0;

}

drivers/gpu/drm/sti/sti_dvo.c

+0 −7
Original line number Diff line number Diff line
@@ -177,12 +177,6 @@ static int dvo_dbg_show(struct seq_file *s, void *data) 
{

	struct drm_info_node *node = s->private;

	struct sti_dvo *dvo = (struct sti_dvo *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	seq_printf(s, "DVO: (vaddr = 0x%p)", dvo->regs);

	DBGFS_DUMP(DVO_AWG_DIGSYNC_CTRL);
@@ -193,7 +187,6 @@ static int dvo_dbg_show(struct seq_file *s, void *data) 
	dvo_dbg_awg_microcode(s, dvo->regs + DVO_DIGSYNC_INSTR_I);

	seq_puts(s, "\n");



	mutex_unlock(&dev->struct_mutex);

	return 0;

}

drivers/gpu/drm/sti/sti_gdp.c

+0 −14
Original line number Diff line number Diff line
@@ -208,14 +208,8 @@ static int gdp_dbg_show(struct seq_file *s, void *data) 
{

	struct drm_info_node *node = s->private;

	struct sti_gdp *gdp = (struct sti_gdp *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	struct drm_plane *drm_plane = &gdp->plane.drm_plane;

	struct drm_crtc *crtc = drm_plane->crtc;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	seq_printf(s, "%s: (vaddr = 0x%p)",

		   sti_plane_to_str(&gdp->plane), gdp->regs);
@@ -248,7 +242,6 @@ static int gdp_dbg_show(struct seq_file *s, void *data) 
		seq_printf(s, "  Connected to DRM CRTC #%d (%s)\n",

			   crtc->base.id, sti_mixer_to_str(to_sti_mixer(crtc)));



	mutex_unlock(&dev->struct_mutex);

	return 0;

}
@@ -279,13 +272,7 @@ static int gdp_node_dbg_show(struct seq_file *s, void *arg) 
{

	struct drm_info_node *node = s->private;

	struct sti_gdp *gdp = (struct sti_gdp *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	unsigned int b;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	for (b = 0; b < GDP_NODE_NB_BANK; b++) {

		seq_printf(s, "\n%s[%d].top", sti_plane_to_str(&gdp->plane), b);
@@ -294,7 +281,6 @@ static int gdp_node_dbg_show(struct seq_file *s, void *arg) 
		gdp_node_dump_node(s, gdp->node_list[b].btm_field);

	}



	mutex_unlock(&dev->struct_mutex);

	return 0;

}

drivers/gpu/drm/sti/sti_hda.c

+0 −7
Original line number Diff line number Diff line
@@ -376,12 +376,6 @@ static int hda_dbg_show(struct seq_file *s, void *data) 
{

	struct drm_info_node *node = s->private;

	struct sti_hda *hda = (struct sti_hda *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	seq_printf(s, "HD Analog: (vaddr = 0x%p)", hda->regs);

	DBGFS_DUMP(HDA_ANA_CFG);
@@ -397,7 +391,6 @@ static int hda_dbg_show(struct seq_file *s, void *data) 
		hda_dbg_video_dacs_ctrl(s, hda->video_dacs_ctrl);

	seq_puts(s, "\n");



	mutex_unlock(&dev->struct_mutex);

	return 0;

}