Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv6140
Modified Files:
control.c hwdep.c init.c rawmidi.c sound.c timer.c
Log Message:
2.5 code cleanups
Index: control.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- control.c 30 May 2003 12:28:32 -0000 1.34
+++ control.c 30 May 2003 13:37:36 -0000 1.35
@@ -927,9 +927,7 @@
static struct file_operations snd_ctl_f_ops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.read = snd_ctl_read,
.open = snd_ctl_open,
.release = snd_ctl_release,
Index: hwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hwdep.c 30 May 2003 12:28:32 -0000 1.17
+++ hwdep.c 30 May 2003 13:37:36 -0000 1.18
@@ -292,9 +292,7 @@
static struct file_operations snd_hwdep_f_ops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.llseek = snd_hwdep_llseek,
.read = snd_hwdep_read,
.write = snd_hwdep_write,
Index: init.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- init.c 30 May 2003 12:28:32 -0000 1.35
+++ init.c 30 May 2003 13:37:36 -0000 1.36
@@ -193,9 +193,7 @@
f_ops = &s_f_ops->f_ops;
memset(f_ops, 0, sizeof(*f_ops));
-#ifndef LINUX_2_2
f_ops->owner = file->f_op->owner;
-#endif
f_ops->release = file->f_op->release;
f_ops->poll = snd_disconnect_poll;
Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rawmidi.c 30 May 2003 12:28:33 -0000 1.33
+++ rawmidi.c 30 May 2003 13:37:36 -0000 1.34
@@ -1316,9 +1316,7 @@
static struct file_operations snd_rawmidi_f_ops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.read = snd_rawmidi_read,
.write = snd_rawmidi_write,
.open = snd_rawmidi_open,
Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sound.c 20 May 2003 21:43:29 -0000 1.45
+++ sound.c 30 May 2003 13:37:36 -0000 1.46
@@ -154,9 +154,7 @@
struct file_operations snd_fops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.open = snd_open
};
@@ -366,9 +364,6 @@
#ifndef MODULE
printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version "
CONFIG_SND_VERSION CONFIG_SND_DATE ".\n");
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_APM)
- pm_init();
-#endif
return 0;
}
@@ -383,9 +378,6 @@
snd_info_minor_unregister();
#endif
snd_info_done();
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_APM)
- pm_done();
-#endif
#ifdef CONFIG_SND_DEBUG_MEMORY
snd_memory_done();
#endif
Index: timer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/timer.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- timer.c 30 May 2003 12:28:33 -0000 1.41
+++ timer.c 30 May 2003 13:37:36 -0000 1.42
@@ -1733,9 +1733,7 @@
static struct file_operations snd_timer_f_ops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.read = snd_timer_user_read,
.open = snd_timer_user_open,
.release = snd_timer_user_release,
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
