X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fvia82cxxx_audio.c;h=b387e1e524859ce38a8c1dddf2a247d3a6381ed0;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=dc1c25663b10a412eaa45bdc93847c7e533f9e42;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index dc1c25663..b387e1e52 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c @@ -62,11 +62,6 @@ } #endif -#if defined(CONFIG_PROC_FS) && \ - defined(CONFIG_SOUND_VIA82CXXX_PROCFS) -#define VIA_PROC_FS 1 -#endif - #define VIA_SUPPORT_MMAP 1 /* buggy, for now... */ #define MAX_CARDS 1 @@ -366,18 +361,6 @@ static void via_chan_clear (struct via_info *card, struct via_channel *chan); static void via_chan_pcm_fmt (struct via_channel *chan, int reset); static void via_chan_buffer_free (struct via_info *card, struct via_channel *chan); -#ifdef VIA_PROC_FS -static int via_init_proc (void); -static void via_cleanup_proc (void); -static int via_card_init_proc (struct via_info *card); -static void via_card_cleanup_proc (struct via_info *card); -#else -static inline int via_init_proc (void) { return 0; } -static inline void via_cleanup_proc (void) {} -static inline int via_card_init_proc (struct via_info *card) { return 0; } -static inline void via_card_cleanup_proc (struct via_info *card) {} -#endif - /**************************************************************** * @@ -2179,7 +2162,7 @@ static int via_mm_swapout (struct page *page, struct file *filp) #endif /* VM_RESERVED */ -struct vm_operations_struct via_mm_ops = { +static struct vm_operations_struct via_mm_ops = { .nopage = via_mm_nopage, #ifndef VM_RESERVED @@ -3483,22 +3466,13 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device goto err_out_have_mixer; } - /* - * per-card /proc info - */ - rc = via_card_init_proc (card); - if (rc) { - printk (KERN_ERR PFX "card-specific /proc init failed, aborting\n"); - goto err_out_have_dsp; - } - /* * init and turn on interrupts, as the last thing we do */ rc = via_interrupt_init (card); if (rc) { printk (KERN_ERR PFX "interrupt init failed, aborting\n"); - goto err_out_have_proc; + goto err_out_have_dsp; } printk (KERN_INFO PFX "board #%d at 0x%04lX, IRQ %d\n", @@ -3538,9 +3512,6 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device DPRINTK ("EXIT, returning 0\n"); return 0; -err_out_have_proc: - via_card_cleanup_proc (card); - err_out_have_dsp: via_dsp_cleanup (card); @@ -3582,7 +3553,6 @@ static void __devexit via_remove_one (struct pci_dev *pdev) #endif free_irq (card->pdev->irq, card); - via_card_cleanup_proc (card); via_dsp_cleanup (card); via_ac97_cleanup (card); @@ -3615,21 +3585,12 @@ static int __init init_via82cxxx_audio(void) DPRINTK ("ENTER\n"); - rc = via_init_proc (); + rc = pci_register_driver (&via_driver); if (rc) { DPRINTK ("EXIT, returning %d\n", rc); return rc; } - rc = pci_register_driver (&via_driver); - if (rc < 1) { - if (rc == 0) - pci_unregister_driver (&via_driver); - via_cleanup_proc (); - DPRINTK ("EXIT, returning -ENODEV\n"); - return -ENODEV; - } - DPRINTK ("EXIT, returning 0\n"); return 0; } @@ -3640,7 +3601,6 @@ static void __exit cleanup_via82cxxx_audio(void) DPRINTK ("ENTER\n"); pci_unregister_driver (&via_driver); - via_cleanup_proc (); DPRINTK ("EXIT\n"); } @@ -3653,181 +3613,3 @@ MODULE_AUTHOR("Jeff Garzik"); MODULE_DESCRIPTION("DSP audio and mixer driver for Via 82Cxxx audio devices"); MODULE_LICENSE("GPL"); - -#ifdef VIA_PROC_FS - -/**************************************************************** - * - * /proc/driver/via/info - * - * - */ - -static int via_info_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ -#define YN(val,bit) (((val) & (bit)) ? "yes" : "no") -#define ED(val,bit) (((val) & (bit)) ? "enable" : "disable") - - int len = 0; - u8 r40, r41, r42, r44; - struct via_info *card = data; - - DPRINTK ("ENTER\n"); - - assert (card != NULL); - - len += sprintf (page+len, VIA_CARD_NAME "\n\n"); - - pci_read_config_byte (card->pdev, 0x40, &r40); - pci_read_config_byte (card->pdev, 0x41, &r41); - pci_read_config_byte (card->pdev, 0x42, &r42); - pci_read_config_byte (card->pdev, 0x44, &r44); - - len += sprintf (page+len, - "Via 82Cxxx PCI registers:\n" - "\n" - "40 Codec Ready: %s\n" - " Codec Low-power: %s\n" - " Secondary Codec Ready: %s\n" - "\n" - "41 Interface Enable: %s\n" - " De-Assert Reset: %s\n" - " Force SYNC high: %s\n" - " Force SDO high: %s\n" - " Variable Sample Rate On-Demand Mode: %s\n" - " SGD Read Channel PCM Data Out: %s\n" - " FM Channel PCM Data Out: %s\n" - " SB PCM Data Out: %s\n" - "\n" - "42 Game port enabled: %s\n" - " SoundBlaster enabled: %s\n" - " FM enabled: %s\n" - " MIDI enabled: %s\n" - "\n" - "44 AC-Link Interface Access: %s\n" - " Secondary Codec Support: %s\n" - - "\n", - - YN (r40, VIA_CR40_AC97_READY), - YN (r40, VIA_CR40_AC97_LOW_POWER), - YN (r40, VIA_CR40_SECONDARY_READY), - - ED (r41, VIA_CR41_AC97_ENABLE), - YN (r41, (1 << 6)), - YN (r41, (1 << 5)), - YN (r41, (1 << 4)), - ED (r41, (1 << 3)), - ED (r41, (1 << 2)), - ED (r41, (1 << 1)), - ED (r41, (1 << 0)), - - YN (r42, VIA_CR42_GAME_ENABLE), - YN (r42, VIA_CR42_SB_ENABLE), - YN (r42, VIA_CR42_FM_ENABLE), - YN (r42, VIA_CR42_MIDI_ENABLE), - - YN (r44, VIA_CR44_AC_LINK_ACCESS), - YN (r44, VIA_CR44_SECOND_CODEC_SUPPORT) - - ); - - DPRINTK ("EXIT, returning %d\n", len); - return len; - -#undef YN -#undef ED -} - - -/**************************************************************** - * - * /proc/driver/via/... setup and cleanup - * - * - */ - -static int __init via_init_proc (void) -{ - DPRINTK ("ENTER\n"); - - if (!proc_mkdir ("driver/via", 0)) - return -EIO; - - DPRINTK ("EXIT, returning 0\n"); - return 0; -} - - -static void via_cleanup_proc (void) -{ - DPRINTK ("ENTER\n"); - - remove_proc_entry ("driver/via", NULL); - - DPRINTK ("EXIT\n"); -} - - -static int __devinit via_card_init_proc (struct via_info *card) -{ - char s[32]; - int rc; - - DPRINTK ("ENTER\n"); - - sprintf (s, "driver/via/%d", card->card_num); - if (!proc_mkdir (s, 0)) { - rc = -EIO; - goto err_out_none; - } - - sprintf (s, "driver/via/%d/info", card->card_num); - if (!create_proc_read_entry (s, 0, 0, via_info_read_proc, card)) { - rc = -EIO; - goto err_out_dir; - } - - sprintf (s, "driver/via/%d/ac97", card->card_num); - if (!create_proc_read_entry (s, 0, 0, ac97_read_proc, card->ac97)) { - rc = -EIO; - goto err_out_info; - } - - DPRINTK ("EXIT, returning 0\n"); - return 0; - -err_out_info: - sprintf (s, "driver/via/%d/info", card->card_num); - remove_proc_entry (s, NULL); - -err_out_dir: - sprintf (s, "driver/via/%d", card->card_num); - remove_proc_entry (s, NULL); - -err_out_none: - DPRINTK ("EXIT, returning %d\n", rc); - return rc; -} - - -static void via_card_cleanup_proc (struct via_info *card) -{ - char s[32]; - - DPRINTK ("ENTER\n"); - - sprintf (s, "driver/via/%d/ac97", card->card_num); - remove_proc_entry (s, NULL); - - sprintf (s, "driver/via/%d/info", card->card_num); - remove_proc_entry (s, NULL); - - sprintf (s, "driver/via/%d", card->card_num); - remove_proc_entry (s, NULL); - - DPRINTK ("EXIT\n"); -} - -#endif /* VIA_PROC_FS */