projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ntb-4.8' of git://github.com/jonmason/ntb
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
sti
/
sti_vid.c
diff --git
a/drivers/gpu/drm/sti/sti_vid.c
b/drivers/gpu/drm/sti/sti_vid.c
index
523ed19
..
47634a0
100644
(file)
--- a/
drivers/gpu/drm/sti/sti_vid.c
+++ b/
drivers/gpu/drm/sti/sti_vid.c
@@
-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_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);
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");
DBGFS_DUMP(VID_CSAT);
seq_puts(s, "\n");
- mutex_unlock(&dev->struct_mutex);
return 0;
}
return 0;
}
@@
-130,7
+123,7
@@
static struct drm_info_list vid_debugfs_files[] = {
{ "vid", vid_dbg_show, 0, NULL },
};
{ "vid", vid_dbg_show, 0, NULL },
};
-
static
int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
+int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
{
unsigned int i;
{
unsigned int i;
@@
-227,8
+220,5
@@
struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
sti_vid_init(vid);
sti_vid_init(vid);
- if (vid_debugfs_init(vid, drm_dev->primary))
- DRM_ERROR("VID debugfs setup failed\n");
-
return vid;
}
return vid;
}