public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [2.6 patch] OSS via82cxxx_audio.c: enable procfs code
@ 2004-11-14  2:24 Adrian Bunk
  2004-11-14 21:42 ` Alan Cox
  0 siblings, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2004-11-14  2:24 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: linux-kernel

The patch below enables the procfs code in sound/oss/via82cxxx_audio.c 
if CONFIG_PROC_FS=y.

This fuxes Bugzilla #3738.


diffstat output:
 sound/oss/via82cxxx_audio.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc1-mm5-full/sound/oss/via82cxxx_audio.c.old	2004-11-14 03:09:05.000000000 +0100
+++ linux-2.6.10-rc1-mm5-full/sound/oss/via82cxxx_audio.c	2004-11-14 03:09:45.000000000 +0100
@@ -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,7 +361,7 @@
 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
+#ifdef CONFIG_PROC_FS
 static int via_init_proc (void);
 static void via_cleanup_proc (void);
 static int via_card_init_proc (struct via_info *card);
@@ -3652,7 +3647,7 @@
 MODULE_LICENSE("GPL");
 
 
-#ifdef VIA_PROC_FS
+#ifdef CONFIG_PROC_FS
 
 /****************************************************************
  *
@@ -3828,4 +3823,4 @@
 	DPRINTK ("EXIT\n");
 }
 
-#endif /* VIA_PROC_FS */
+#endif /* CONFIG_PROC_FS */


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS via82cxxx_audio.c: enable procfs code
  2004-11-14  2:24 [2.6 patch] OSS via82cxxx_audio.c: enable procfs code Adrian Bunk
@ 2004-11-14 21:42 ` Alan Cox
  2004-11-15  0:05   ` Jeff Garzik
  0 siblings, 1 reply; 5+ messages in thread
From: Alan Cox @ 2004-11-14 21:42 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Jeff Garzik, Linux Kernel Mailing List

On Sul, 2004-11-14 at 02:24, Adrian Bunk wrote:
> The patch below enables the procfs code in sound/oss/via82cxxx_audio.c 
> if CONFIG_PROC_FS=y.

I don't see what needs fixing here. Generally the /proc file shouldnt
exist


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS via82cxxx_audio.c: enable procfs code
  2004-11-14 21:42 ` Alan Cox
@ 2004-11-15  0:05   ` Jeff Garzik
  2004-11-15  0:12     ` Adrian Bunk
  0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2004-11-15  0:05 UTC (permalink / raw)
  To: Alan Cox; +Cc: Adrian Bunk, Linux Kernel Mailing List

Alan Cox wrote:
> On Sul, 2004-11-14 at 02:24, Adrian Bunk wrote:
> 
>>The patch below enables the procfs code in sound/oss/via82cxxx_audio.c 
>>if CONFIG_PROC_FS=y.
> 
> 
> I don't see what needs fixing here. Generally the /proc file shouldnt
> exist

Existing procfs code in via82cxxx_audio is never enabled, due to removal 
of CONFIG_SOUND_VIA82CXXX_PROCFS:

#if defined(CONFIG_PROC_FS) && \
     defined(CONFIG_SOUND_VIA82CXXX_PROCFS)
#define VIA_PROC_FS 1
#endif

However, I don't mind if someone removes the procfs code completely.

	Jeff



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS via82cxxx_audio.c: enable procfs code
  2004-11-15  0:05   ` Jeff Garzik
@ 2004-11-15  0:12     ` Adrian Bunk
  2004-11-15  0:45       ` Jeff Garzik
  0 siblings, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2004-11-15  0:12 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Alan Cox, Linux Kernel Mailing List

On Sun, Nov 14, 2004 at 07:05:45PM -0500, Jeff Garzik wrote:
> Alan Cox wrote:
> >On Sul, 2004-11-14 at 02:24, Adrian Bunk wrote:
> >
> >>The patch below enables the procfs code in sound/oss/via82cxxx_audio.c 
> >>if CONFIG_PROC_FS=y.
> >
> >
> >I don't see what needs fixing here. Generally the /proc file shouldnt
> >exist
> 
> Existing procfs code in via82cxxx_audio is never enabled, due to removal 
> of CONFIG_SOUND_VIA82CXXX_PROCFS:
> 
> #if defined(CONFIG_PROC_FS) && \
>     defined(CONFIG_SOUND_VIA82CXXX_PROCFS)
> #define VIA_PROC_FS 1
> #endif
> 
> However, I don't mind if someone removes the procfs code completely.

How else is this information available?

> 	Jeff

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS via82cxxx_audio.c: enable procfs code
  2004-11-15  0:12     ` Adrian Bunk
@ 2004-11-15  0:45       ` Jeff Garzik
  0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2004-11-15  0:45 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Alan Cox, Linux Kernel Mailing List

Adrian Bunk wrote:
> On Sun, Nov 14, 2004 at 07:05:45PM -0500, Jeff Garzik wrote:
> 
>>Alan Cox wrote:
>>
>>>On Sul, 2004-11-14 at 02:24, Adrian Bunk wrote:
>>>
>>>
>>>>The patch below enables the procfs code in sound/oss/via82cxxx_audio.c 
>>>>if CONFIG_PROC_FS=y.
>>>
>>>
>>>I don't see what needs fixing here. Generally the /proc file shouldnt
>>>exist
>>
>>Existing procfs code in via82cxxx_audio is never enabled, due to removal 
>>of CONFIG_SOUND_VIA82CXXX_PROCFS:
>>
>>#if defined(CONFIG_PROC_FS) && \
>>    defined(CONFIG_SOUND_VIA82CXXX_PROCFS)
>>#define VIA_PROC_FS 1
>>#endif
>>
>>However, I don't mind if someone removes the procfs code completely.
> 
> 
> How else is this information available?

lspci.  it's just a verbose dump of PCI config registers.



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2004-11-15  0:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-11-14  2:24 [2.6 patch] OSS via82cxxx_audio.c: enable procfs code Adrian Bunk
2004-11-14 21:42 ` Alan Cox
2004-11-15  0:05   ` Jeff Garzik
2004-11-15  0:12     ` Adrian Bunk
2004-11-15  0:45       ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox