mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-27 08:14:35 +08:00
drm: sti: remove useless call to dev->struct_mutex
No need to protect debugfs functions with dev->struct_mutex Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1464630800-30786-19-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
parent
bd884b74bb
commit
ac851bf14b
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -628,12 +628,6 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
|
||||
{
|
||||
struct drm_info_node *node = s->private;
|
||||
struct sti_hdmi *hdmi = (struct sti_hdmi *)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, "HDMI: (vaddr = 0x%p)", hdmi->regs);
|
||||
DBGFS_DUMP("\n", HDMI_CFG);
|
||||
@ -690,7 +684,6 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
|
||||
DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_VENDOR);
|
||||
seq_puts(s, "\n");
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -555,14 +555,8 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data)
|
||||
{
|
||||
struct drm_info_node *node = s->private;
|
||||
struct sti_hqvdp *hqvdp = (struct sti_hqvdp *)node->info_ent->data;
|
||||
struct drm_device *dev = node->minor->dev;
|
||||
int cmd, cmd_offset, infoxp70;
|
||||
void *virt;
|
||||
int ret;
|
||||
|
||||
ret = mutex_lock_interruptible(&dev->struct_mutex);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
seq_printf(s, "%s: (vaddr = 0x%p)",
|
||||
sti_plane_to_str(&hqvdp->plane), hqvdp->regs);
|
||||
@ -630,7 +624,6 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data)
|
||||
|
||||
seq_puts(s, "\n");
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -151,12 +151,6 @@ static int mixer_dbg_show(struct seq_file *s, void *arg)
|
||||
{
|
||||
struct drm_info_node *node = s->private;
|
||||
struct sti_mixer *mixer = (struct sti_mixer *)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_mixer_to_str(mixer), mixer->regs);
|
||||
@ -176,7 +170,6 @@ static int mixer_dbg_show(struct seq_file *s, void *arg)
|
||||
mixer_dbg_mxn(s, mixer->regs + GAM_MIXER_MX0);
|
||||
seq_puts(s, "\n");
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -515,13 +515,7 @@ static int tvout_dbg_show(struct seq_file *s, void *data)
|
||||
{
|
||||
struct drm_info_node *node = s->private;
|
||||
struct sti_tvout *tvout = (struct sti_tvout *)node->info_ent->data;
|
||||
struct drm_device *dev = node->minor->dev;
|
||||
struct drm_crtc *crtc;
|
||||
int ret;
|
||||
|
||||
ret = mutex_lock_interruptible(&dev->struct_mutex);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
seq_printf(s, "TVOUT: (vaddr = 0x%p)", tvout->regs);
|
||||
|
||||
@ -587,7 +581,6 @@ static int tvout_dbg_show(struct seq_file *s, void *data)
|
||||
DBGFS_DUMP(TVO_AUX_IN_VID_FORMAT);
|
||||
seq_puts(s, "\n");
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -92,12 +92,6 @@ static int vid_dbg_show(struct seq_file *s, void *arg)
|
||||
{
|
||||
struct drm_info_node *node = s->private;
|
||||
struct sti_vid *vid = (struct sti_vid *)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, "VID: (vaddr= 0x%p)", vid->regs);
|
||||
|
||||
@ -122,7 +116,6 @@ static int vid_dbg_show(struct seq_file *s, void *arg)
|
||||
DBGFS_DUMP(VID_CSAT);
|
||||
seq_puts(s, "\n");
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user