patch-2.4.0-test2 linux/drivers/sound/esssolo1.c

• Lines: 88
• Date: Tue Jun 20 07:52:36 2000
• Orig file: v2.4.0-test1/linux/drivers/sound/esssolo1.c
• Orig date: Mon Jun 19 16:32:00 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sound/esssolo1.c linux/drivers/sound/esssolo1.c
@@ -909,7 +909,6 @@
 	}
        	VALIDATE_STATE(s);
 	file->private_data = s;
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -918,7 +917,6 @@
 	struct solo1_state *s = (struct solo1_state *)file->private_data;
 
 	VALIDATE_STATE(s);
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -928,6 +926,7 @@
 }
 
 static /*const*/ struct file_operations solo1_mixer_fops = {
+	owner:		THIS_MODULE,
 	llseek:		solo1_llseek,
 	ioctl:		solo1_ioctl_mixdev,
 	open:		solo1_open_mixdev,
@@ -1526,7 +1525,6 @@
 	s->open_mode &= ~(FMODE_READ | FMODE_WRITE);
 	wake_up(&s->open_wait);
 	up(&s->open_sem);
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -1572,12 +1570,12 @@
 	s->dma_dac.ossfragshift = s->dma_dac.ossmaxfrags = s->dma_dac.subdivision = 0;
 	s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
 	up(&s->open_sem);
-	MOD_INC_USE_COUNT;
 	prog_codec(s);
 	return 0;
 }
 
 static /*const*/ struct file_operations solo1_audio_fops = {
+	owner:		THIS_MODULE,
 	llseek:		solo1_llseek,
 	read:		solo1_read,
 	write:		solo1_write,
@@ -1869,7 +1867,6 @@
 	spin_unlock_irqrestore(&s->lock, flags);
 	s->open_mode |= (file->f_mode << FMODE_MIDI_SHIFT) & (FMODE_MIDI_READ | FMODE_MIDI_WRITE);
 	up(&s->open_sem);
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -1915,11 +1912,11 @@
 	spin_unlock_irqrestore(&s->lock, flags);
 	wake_up(&s->open_wait);
 	up(&s->open_sem);
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
 static /*const*/ struct file_operations solo1_midi_fops = {
+	owner:		THIS_MODULE,
 	llseek:		solo1_llseek,
 	read:		solo1_midi_read,
 	write:		solo1_midi_write,
@@ -2075,7 +2072,6 @@
 	outb(1, s->sbbase+3);  /* enable OPL3 */
 	s->open_mode |= FMODE_DMFM;
 	up(&s->open_sem);
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -2096,11 +2092,11 @@
 	release_region(s->sbbase, FMSYNTH_EXTENT);
 	wake_up(&s->open_wait);
 	up(&s->open_sem);
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
 static /*const*/ struct file_operations solo1_dmfm_fops = {
+	owner:		THIS_MODULE,
 	llseek:		solo1_llseek,
 	ioctl:		solo1_dmfm_ioctl,
 	open:		solo1_dmfm_open,