patch-2.4.9 linux/drivers/sound/maestro.c

• Lines: 59
• Date: Sun Aug 12 10:51:42 2001
• Orig file: v2.4.8/linux/drivers/sound/maestro.c
• Orig date: Wed Jul 25 17:10:23 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/sound/maestro.c linux/drivers/sound/maestro.c
@@ -1290,7 +1290,7 @@
 }
 
 /* Stop our host of recording apus */
-extern inline void stop_adc(struct ess_state *s)
+static inline void stop_adc(struct ess_state *s)
 {
 	/* XXX lets hope we don't have to lock around this */
 	if (! (s->enable & ADC_RUNNING)) return;
@@ -1594,7 +1594,7 @@
 }
 
 /* Playback pointer */
-extern __inline__ unsigned get_dmaa(struct ess_state *s)
+static inline unsigned get_dmaa(struct ess_state *s)
 {
 	int offset;
 
@@ -1608,7 +1608,7 @@
 }
 
 /* Record pointer */
-extern __inline__ unsigned get_dmac(struct ess_state *s)
+static inline unsigned get_dmac(struct ess_state *s)
 {
 	int offset;
 
@@ -2122,13 +2122,6 @@
 }
 
 /* --------------------------------------------------------------------- */
-
-static loff_t ess_llseek(struct file *file, loff_t offset, int origin)
-{
-	return -ESPIPE;
-}
-
-/* --------------------------------------------------------------------- */
 static int ess_open_mixdev(struct inode *inode, struct file *file)
 {
 	int minor = MINOR(inode->i_rdev);
@@ -2172,7 +2165,7 @@
 
 static /*const*/ struct file_operations ess_mixer_fops = {
 	owner:		THIS_MODULE,
-	llseek:         ess_llseek,
+	llseek:         no_llseek,
 	ioctl:          ess_ioctl_mixdev,
 	open:           ess_open_mixdev,
 	release:        ess_release_mixdev,
@@ -3104,7 +3097,7 @@
 
 static struct file_operations ess_audio_fops = {
 	owner:		THIS_MODULE,
-	llseek:         ess_llseek,
+	llseek:         no_llseek,
 	read:           ess_read,
 	write:          ess_write,
 	poll:           ess_poll,