Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull VFS updates from Al Viro,

Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).

7kloc removed.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
  don't bother with deferred freeing of fdtables
  proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
  proc: Make the PROC_I() and PDE() macros internal to procfs
  proc: Supply a function to remove a proc entry by PDE
  take cgroup_open() and cpuset_open() to fs/proc/base.c
  ppc: Clean up scanlog
  ppc: Clean up rtas_flash driver somewhat
  hostap: proc: Use remove_proc_subtree()
  drm: proc: Use remove_proc_subtree()
  drm: proc: Use minor->index to label things, not PDE->name
  drm: Constify drm_proc_list[]
  zoran: Don't print proc_dir_entry data in debug
  reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
  proc: Supply an accessor for getting the data from a PDE's parent
  airo: Use remove_proc_subtree()
  rtl8192u: Don't need to save device proc dir PDE
  rtl8187se: Use a dir under /proc/net/r8180/
  proc: Add proc_mkdir_data()
  proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
  proc: Move PDE_NET() to fs/proc/proc_net.c
  ...

1 files changed, 19 insertions, 24 deletions

diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 8d411a3c9966..a54f7f7d763b 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -333,29 +333,23 @@ static int proc_output(char *buf)
         return p - buf;
 }
 
-static int
-adv7393_read_proc(char *page, char **start, off_t off,
-                  int count, int *eof, void *data)
+static ssize_t
+adv7393_read_proc(struct file *file, char __user *buf,
+                  size_t size, loff_t *ppos)
 {
-        int len;
-
-        len = proc_output(page);
-        if (len <= off + count)
-                *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len > count)
-                len = count;
-        if (len < 0)
-                len = 0;
-        return len;
+        static const char message[] = "Usage:\n"
+                "echo 0x[REG][Value] > adv7393\n"
+                "example: echo 0x1234 >adv7393\n"
+                "writes 0x34 into Register 0x12\n";
+        return simple_read_from_buffer(buf, size, ppos, message,
+                                        sizeof(message));
 }
 
-static int
+static ssize_t
 adv7393_write_proc(struct file *file, const char __user * buffer,
-                   size_t count, void *data)
+                   size_t count, loff_t *ppos)
 {
-        struct adv7393fb_device *fbdev = data;
+        struct adv7393fb_device *fbdev = PDE_DATA(file_inode(file));
         unsigned int val;
         int ret;
 
@@ -368,6 +362,12 @@ adv7393_write_proc(struct file *file, const char __user * buffer,
         return count;
 }
 
+static const struct file_operations fops = {
+        .read = adv7393_read_proc,
+        .write = adv7393_write_proc,
+        .llseek = default_llseek,
+};
+
 static int bfin_adv7393_fb_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
@@ -506,17 +506,12 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
                fbdev->info.node, fbdev->info.fix.id);
         dev_info(&client->dev, "fb memory address : 0x%p\n", fbdev->fb_mem);
 
-        entry = create_proc_entry("driver/adv7393", 0, NULL);
+        entry = proc_create_data("driver/adv7393", 0, NULL, &fops, fbdev);
         if (!entry) {
                 dev_err(&client->dev, "unable to create /proc entry\n");
                 ret = -EFAULT;
                 goto free_fb;
         }
-
-        entry->read_proc = adv7393_read_proc;
-        entry->write_proc = adv7393_write_proc;
-        entry->data = fbdev;
-
         return 0;
 
 free_fb: