--- info.c 2003-05-30 14:29:41.000000000 +0200 +++ info.c 2003-05-30 14:28:42.000000000 +0200 @@ -1,3 +1,4 @@ +#include "info.inc" /* * Information interface for ALSA driver * Copyright (c) by Jaroslav Kysela @@ -121,6 +122,7 @@ 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; @@ -132,6 +134,7 @@ if (de) remove_proc_entry(de->name, parent); } +#endif static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig) { @@ -141,7 +144,9 @@ 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) { @@ -170,7 +175,9 @@ } ret = -ENXIO; out: +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) unlock_kernel(); +#endif return ret; } @@ -489,7 +496,9 @@ 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, @@ -908,9 +917,16 @@ up(&info_mutex); return -ENOMEM; } +#ifndef LINUX_2_2 p->owner = entry->module; - if (!S_ISDIR(entry->mode)) +#endif + if (!S_ISDIR(entry->mode)) { +#ifndef LINUX_2_2 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;