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

Commit 7bc56323 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert sound 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17b75e69

sound/core/info.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static long snd_info_entry_ioctl(struct file *file, unsigned int cmd, 


static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	struct snd_info_private_data *data;

	struct snd_info_entry *entry;

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ static struct file *snd_pcm_file_fd(int fd) 
	file = fget(fd);

	if (!file)

		return NULL;

	inode = file->f_dentry->d_inode;

	inode = file->f_path.dentry->d_inode;

	if (!S_ISCHR(inode->i_mode) ||

	    imajor(inode) != snd_major) {

		fput(file);

sound/oss/dmasound/dmasound_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int sq_release(struct inode *inode, struct file *file) 


	if (file->f_mode & FMODE_WRITE) {

		if (write_sq.busy)

			rc = sq_fsync(file, file->f_dentry);

			rc = sq_fsync(file, file->f_path.dentry);



		sq_reset_output() ; /* make sure dma is stopped and all is quiet */

		write_sq_release_buffers();
@@ -1217,7 +1217,7 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd, 
		if ((file->f_mode & FMODE_READ) && dmasound.mach.record)

			sq_reset_input() ;

		if (file->f_mode & FMODE_WRITE) {

			result = sq_fsync(file, file->f_dentry);

			result = sq_fsync(file, file->f_path.dentry);

			sq_reset_output() ;

		}

		/* if we are the shared resource owner then release them */

sound/oss/msnd_pinnacle.c

+2 −2
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static int dsp_write(const char __user *buf, size_t len) 


static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)

{

	int minor = iminor(file->f_dentry->d_inode);

	int minor = iminor(file->f_path.dentry->d_inode);

	if (minor == dev.dsp_minor)

		return dsp_read(buf, count);

	else
@@ -1016,7 +1016,7 @@ static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_ 


static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)

{

	int minor = iminor(file->f_dentry->d_inode);

	int minor = iminor(file->f_path.dentry->d_inode);

	if (minor == dev.dsp_minor)

		return dsp_write(buf, count);

	else

sound/oss/soundcard.c

+4 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int get_mixer_levels(void __user * arg) 


static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)

{

	int dev = iminor(file->f_dentry->d_inode);

	int dev = iminor(file->f_path.dentry->d_inode);

	int ret = -EINVAL;



	/*
@@ -174,7 +174,7 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof 


static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)

{

	int dev = iminor(file->f_dentry->d_inode);

	int dev = iminor(file->f_path.dentry->d_inode);

	int ret = -EINVAL;

	

	lock_kernel();
@@ -393,7 +393,7 @@ static int sound_ioctl(struct inode *inode, struct file *file, 


static unsigned int sound_poll(struct file *file, poll_table * wait)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int dev = iminor(inode);



	DEB(printk("sound_poll(dev=%d)\n", dev));
@@ -418,7 +418,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma) 
	int dev_class;

	unsigned long size;

	struct dma_buffparms *dmap = NULL;

	int dev = iminor(file->f_dentry->d_inode);

	int dev = iminor(file->f_path.dentry->d_inode);



	dev_class = dev & 0x0f;

	dev >>= 4;