patch-2.1.88 linux/drivers/char/dsp56k.c

Next file: linux/drivers/char/ftape/compressor/zftape-compress.c
Previous file: linux/drivers/char/c-qcam.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.87/linux/drivers/char/dsp56k.c linux/drivers/char/dsp56k.c
@@ -23,7 +23,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/malloc.h>	/* for kmalloc() and kfree() */
@@ -207,9 +206,10 @@
 	return 0;
 }
 
-static long dsp56k_read(struct inode *inode, struct file *file,
-			char *buf, unsigned long count)
+static ssize_t dsp56k_read(struct file *file, char *buf, size_t count,
+			   loff_t *ppos)
 {
+	struct inode *inode = file->f_dentry->d_inode;
 	int dev = MINOR(inode->i_rdev) & 0x0f;
 
 	switch(dev)
@@ -269,9 +269,10 @@
 	}
 }
 
-static long dsp56k_write(struct inode *inode, struct file *file,
-			 const char *buf, unsigned long count)
+static ssize_t dsp56k_write(struct file *file, const char *buf, size_t count,
+			    loff_t *ppos)
 {
+	struct inode *inode = file->f_dentry->d_inode;
 	int dev = MINOR(inode->i_rdev) & 0x0f;
 
 	switch(dev)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov