aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:40 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:49 -0500
commit7bc563239e4c276afebd11d2e6e67ddc0cc65f0d (patch)
tree7a4c13715285bc374297d439d01f703e0184df69 /sound
parent17b75e69493f655a09908045eddbb48718aef5de (diff)
[PATCH] struct path: convert sound
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/info.c2
-rw-r--r--sound/core/pcm_native.c2
-rw-r--r--sound/oss/dmasound/dmasound_core.c4
-rw-r--r--sound/oss/msnd_pinnacle.c4
-rw-r--r--sound/oss/soundcard.c8
-rw-r--r--sound/sound_firmware.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 0b4aab3225e5..54591e2eb6ee 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -488,7 +488,7 @@ static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
488 488
489static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) 489static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
490{ 490{
491 struct inode *inode = file->f_dentry->d_inode; 491 struct inode *inode = file->f_path.dentry->d_inode;
492 struct snd_info_private_data *data; 492 struct snd_info_private_data *data;
493 struct snd_info_entry *entry; 493 struct snd_info_entry *entry;
494 494
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 6ea67b16c676..b52e89393fa3 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1604,7 +1604,7 @@ static struct file *snd_pcm_file_fd(int fd)
1604 file = fget(fd); 1604 file = fget(fd);
1605 if (!file) 1605 if (!file)
1606 return NULL; 1606 return NULL;
1607 inode = file->f_dentry->d_inode; 1607 inode = file->f_path.dentry->d_inode;
1608 if (!S_ISCHR(inode->i_mode) || 1608 if (!S_ISCHR(inode->i_mode) ||
1609 imajor(inode) != snd_major) { 1609 imajor(inode) != snd_major) {
1610 fput(file); 1610 fput(file);
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 87bd3100aef3..80b836e80d99 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -1051,7 +1051,7 @@ static int sq_release(struct inode *inode, struct file *file)
1051 1051
1052 if (file->f_mode & FMODE_WRITE) { 1052 if (file->f_mode & FMODE_WRITE) {
1053 if (write_sq.busy) 1053 if (write_sq.busy)
1054 rc = sq_fsync(file, file->f_dentry); 1054 rc = sq_fsync(file, file->f_path.dentry);
1055 1055
1056 sq_reset_output() ; /* make sure dma is stopped and all is quiet */ 1056 sq_reset_output() ; /* make sure dma is stopped and all is quiet */
1057 write_sq_release_buffers(); 1057 write_sq_release_buffers();
@@ -1217,7 +1217,7 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
1217 if ((file->f_mode & FMODE_READ) && dmasound.mach.record) 1217 if ((file->f_mode & FMODE_READ) && dmasound.mach.record)
1218 sq_reset_input() ; 1218 sq_reset_input() ;
1219 if (file->f_mode & FMODE_WRITE) { 1219 if (file->f_mode & FMODE_WRITE) {
1220 result = sq_fsync(file, file->f_dentry); 1220 result = sq_fsync(file, file->f_path.dentry);
1221 sq_reset_output() ; 1221 sq_reset_output() ;
1222 } 1222 }
1223 /* if we are the shared resource owner then release them */ 1223 /* if we are the shared resource owner then release them */
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index d5146790f5e3..24110d63b136 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -1007,7 +1007,7 @@ static int dsp_write(const char __user *buf, size_t len)
1007 1007
1008static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off) 1008static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)
1009{ 1009{
1010 int minor = iminor(file->f_dentry->d_inode); 1010 int minor = iminor(file->f_path.dentry->d_inode);
1011 if (minor == dev.dsp_minor) 1011 if (minor == dev.dsp_minor)
1012 return dsp_read(buf, count); 1012 return dsp_read(buf, count);
1013 else 1013 else
@@ -1016,7 +1016,7 @@ static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_
1016 1016
1017static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off) 1017static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
1018{ 1018{
1019 int minor = iminor(file->f_dentry->d_inode); 1019 int minor = iminor(file->f_path.dentry->d_inode);
1020 if (minor == dev.dsp_minor) 1020 if (minor == dev.dsp_minor)
1021 return dsp_write(buf, count); 1021 return dsp_write(buf, count);
1022 else 1022 else
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 8fb8e7f99556..a89108cb74ea 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -141,7 +141,7 @@ static int get_mixer_levels(void __user * arg)
141 141
142static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 142static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
143{ 143{
144 int dev = iminor(file->f_dentry->d_inode); 144 int dev = iminor(file->f_path.dentry->d_inode);
145 int ret = -EINVAL; 145 int ret = -EINVAL;
146 146
147 /* 147 /*
@@ -174,7 +174,7 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof
174 174
175static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) 175static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
176{ 176{
177 int dev = iminor(file->f_dentry->d_inode); 177 int dev = iminor(file->f_path.dentry->d_inode);
178 int ret = -EINVAL; 178 int ret = -EINVAL;
179 179
180 lock_kernel(); 180 lock_kernel();
@@ -393,7 +393,7 @@ static int sound_ioctl(struct inode *inode, struct file *file,
393 393
394static unsigned int sound_poll(struct file *file, poll_table * wait) 394static unsigned int sound_poll(struct file *file, poll_table * wait)
395{ 395{
396 struct inode *inode = file->f_dentry->d_inode; 396 struct inode *inode = file->f_path.dentry->d_inode;
397 int dev = iminor(inode); 397 int dev = iminor(inode);
398 398
399 DEB(printk("sound_poll(dev=%d)\n", dev)); 399 DEB(printk("sound_poll(dev=%d)\n", dev));
@@ -418,7 +418,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
418 int dev_class; 418 int dev_class;
419 unsigned long size; 419 unsigned long size;
420 struct dma_buffparms *dmap = NULL; 420 struct dma_buffparms *dmap = NULL;
421 int dev = iminor(file->f_dentry->d_inode); 421 int dev = iminor(file->f_path.dentry->d_inode);
422 422
423 dev_class = dev & 0x0f; 423 dev_class = dev & 0x0f;
424 dev >>= 4; 424 dev >>= 4;
diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index 3a181d4c0dc6..3304344713ae 100644
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -19,7 +19,7 @@ static int do_mod_firmware_load(const char *fn, char **fp)
19 printk(KERN_INFO "Unable to load '%s'.\n", fn); 19 printk(KERN_INFO "Unable to load '%s'.\n", fn);
20 return 0; 20 return 0;
21 } 21 }
22 l = filp->f_dentry->d_inode->i_size; 22 l = filp->f_path.dentry->d_inode->i_size;
23 if (l <= 0 || l > 131072) 23 if (l <= 0 || l > 131072)
24 { 24 {
25 printk(KERN_INFO "Invalid firmware '%s'\n", fn); 25 printk(KERN_INFO "Invalid firmware '%s'\n", fn);