Update of /cvsroot/alsa/alsa-kernel/core In directory usw-pr-cvs1:/tmp/cvs-serv21371
Modified Files: info.c sound.c Log Message: DEVFS cleanup - removal of code for 2.2 and 2.4 kernels Index: info.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- info.c 1 Oct 2002 14:49:16 -0000 1.19 +++ info.c 2 Oct 2002 06:28:20 -0000 1.20 @@ -960,7 +960,6 @@ { #ifdef CONFIG_DEVFS_FS char dname[32]; - devfs_handle_t master; #endif snd_runtime_check(entry, return); @@ -970,12 +969,7 @@ #ifdef CONFIG_DEVFS_FS if (entry->p && strncmp(entry->name, "controlC", 8)) { sprintf(dname, "snd/%s", entry->name); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) - master = devfs_find_handle(NULL, dname, strlen(dname), 0, 0, DEVFS_SPECIAL_CHR, 0); - devfs_unregister(master); -#else devfs_find_and_unregister(NULL, dname, 0, 0, DEVFS_SPECIAL_CHR, 0); -#endif } #endif snd_info_free_entry(entry); Index: sound.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sound.c 26 Sep 2002 19:20:54 -0000 1.23 +++ sound.c 2 Oct 2002 06:28:20 -0000 1.24 @@ -358,21 +358,12 @@ static void __exit alsa_sound_exit(void) { #ifdef CONFIG_DEVFS_FS - devfs_handle_t master; char controlname[24]; short controlnum; for (controlnum = 0; controlnum < snd_cards_limit; controlnum++) { sprintf(controlname, "snd/controlC%d", controlnum); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) - master = devfs_find_handle(NULL, controlname, strlen(controlname), 0, 0, DEVFS_SPECIAL_CHR, 0); - devfs_unregister(master); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - master = devfs_find_handle(NULL, controlname, 0, 0, DEVFS_SPECIAL_CHR, 0); - devfs_unregister(master); -#else devfs_find_and_unregister(NULL, controlname, 0, 0, DEVFS_SPECIAL_CHR, 0); -#endif } #endif ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog