* [PATCH] fix warning in kernel/dma.c
@ 2003-02-17 21:55 Sam Ravnborg
0 siblings, 0 replies; only message in thread
From: Sam Ravnborg @ 2003-02-17 21:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
When compiling without PROC_FS enabled a warning is issued about
proc_dma_show defined but not used.
Move both versions of proc_dma_show inside the #ifdef CONFIG_PROC_FS
Sam
===== kernel/dma.c 1.5 vs edited =====
--- 1.5/kernel/dma.c Wed Aug 28 09:53:26 2002
+++ edited/kernel/dma.c Mon Feb 17 22:30:17 2003
@@ -98,6 +98,22 @@
} /* free_dma */
+#else
+
+int request_dma(unsigned int dmanr, const char *device_id)
+{
+ return -EINVAL;
+}
+
+void free_dma(unsigned int dmanr)
+{
+}
+
+#endif
+
+#ifdef CONFIG_PROC_FS
+
+#ifdef MAX_DMA_CHANNELS
static int proc_dma_show(struct seq_file *m, void *v)
{
int i;
@@ -110,27 +126,14 @@
}
return 0;
}
-
#else
-
-int request_dma(unsigned int dmanr, const char *device_id)
-{
- return -EINVAL;
-}
-
-void free_dma(unsigned int dmanr)
-{
-}
-
static int proc_dma_show(struct seq_file *m, void *v)
{
seq_puts(m, "No DMA\n");
return 0;
}
+#endif /* MAX_DMA_CHANNELS */
-#endif
-
-#ifdef CONFIG_PROC_FS
static int proc_dma_open(struct inode *inode, struct file *file)
{
char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-02-17 21:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-02-17 21:55 [PATCH] fix warning in kernel/dma.c Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®