Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv14068
Modified Files:
info.c
Log Message:
Cleanups for 2.5 tree
Index: info.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- info.c 25 May 2003 13:56:58 -0000 1.37
+++ info.c 30 May 2003 12:53:10 -0000 1.38
@@ -121,7 +121,6 @@
snd_info_entry_t *snd_oss_root = NULL;
#endif
-#ifndef LINUX_2_2
static inline void snd_info_entry_prepare(struct proc_dir_entry *de)
{
de->owner = THIS_MODULE;
@@ -133,7 +132,6 @@
if (de)
remove_proc_entry(de->name, parent);
}
-#endif
static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
{
@@ -143,9 +141,7 @@
data = snd_magic_cast(snd_info_private_data_t, file->private_data, return
-ENXIO);
entry = data->entry;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3)
lock_kernel();
-#endif
switch (entry->content) {
case SNDRV_INFO_CONTENT_TEXT:
switch (orig) {
@@ -174,9 +170,7 @@
}
ret = -ENXIO;
out:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3)
unlock_kernel();
-#endif
return ret;
}
@@ -495,9 +489,7 @@
static struct file_operations snd_info_entry_operations =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.llseek = snd_info_entry_llseek,
.read = snd_info_entry_read,
.write = snd_info_entry_write,
@@ -916,16 +908,9 @@
up(&info_mutex);
return -ENOMEM;
}
-#ifndef LINUX_2_2
p->owner = entry->module;
-#endif
- if (!S_ISDIR(entry->mode)) {
-#ifndef LINUX_2_2
+ if (!S_ISDIR(entry->mode))
p->proc_fops = &snd_info_entry_operations;
-#else
- p->ops = &snd_info_entry_inode_operations;
-#endif
- }
p->size = entry->size;
p->data = entry;
entry->p = p;
-------------------------------------------------------
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
