Commit 14ccf179 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Linus Torvalds

[PATCH] fix warning in kernel/dma.c

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
parent 79a54256
...@@ -98,6 +98,22 @@ void free_dma(unsigned int dmanr) ...@@ -98,6 +98,22 @@ void free_dma(unsigned int dmanr)
} /* free_dma */ } /* 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) static int proc_dma_show(struct seq_file *m, void *v)
{ {
int i; int i;
...@@ -110,27 +126,14 @@ static int proc_dma_show(struct seq_file *m, void *v) ...@@ -110,27 +126,14 @@ static int proc_dma_show(struct seq_file *m, void *v)
} }
return 0; return 0;
} }
#else #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) static int proc_dma_show(struct seq_file *m, void *v)
{ {
seq_puts(m, "No DMA\n"); seq_puts(m, "No DMA\n");
return 0; return 0;
} }
#endif /* MAX_DMA_CHANNELS */
#endif
#ifdef CONFIG_PROC_FS
static int proc_dma_open(struct inode *inode, struct file *file) static int proc_dma_open(struct inode *inode, struct file *file)
{ {
char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment