Skip to content

Commit

Permalink
sh: Don't use create_proc_read_entry()
Browse files Browse the repository at this point in the history
Don't use create_proc_read_entry() as that is deprecated, but rather use
proc_create_data() and seq_file instead.

Signed-off-by: David Howells <[email protected]>
cc: Paul Mundt <[email protected]>
cc: [email protected]
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
dhowells authored and Al Viro committed Apr 29, 2013
1 parent c7f079c commit 64f0962
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions arch/sh/drivers/dma/dma-api.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/list.h>
#include <linux/platform_device.h>
#include <linux/mm.h>
Expand Down Expand Up @@ -308,11 +309,9 @@ int dma_extend(unsigned int chan, unsigned long op, void *param)
}
EXPORT_SYMBOL(dma_extend);

static int dma_read_proc(char *buf, char **start, off_t off,
int len, int *eof, void *data)
static int dma_proc_show(struct seq_file *m, void *v)
{
struct dma_info *info;
char *p = buf;
struct dma_info *info = v;

if (list_empty(&registered_dmac_list))
return 0;
Expand All @@ -332,14 +331,26 @@ static int dma_read_proc(char *buf, char **start, off_t off,
if (!(channel->flags & DMA_CONFIGURED))
continue;

p += sprintf(p, "%2d: %14s %s\n", i,
info->name, channel->dev_id);
seq_printf(m, "%2d: %14s %s\n", i,
info->name, channel->dev_id);
}
}

return p - buf;
return 0;
}

static int dma_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, dma_proc_show, NULL);
}

static const struct file_operations dma_proc_fops = {
.open = dma_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};

int register_dmac(struct dma_info *info)
{
unsigned int total_channels, i;
Expand Down Expand Up @@ -412,8 +423,7 @@ EXPORT_SYMBOL(unregister_dmac);
static int __init dma_api_init(void)
{
printk(KERN_NOTICE "DMA: Registering DMA API.\n");
return create_proc_read_entry("dma", 0, 0, dma_read_proc, 0)
? 0 : -ENOMEM;
return proc_create("dma", 0, NULL, &dma_proc_fops) ? 0 : -ENOMEM;
}
subsys_initcall(dma_api_init);

Expand Down

0 comments on commit 64f0962

Please sign in to comment.