ide: convert to ->proc_fops

->read_proc, ->write_proc are going away, ->proc_fops should be used instead.

The only tricky place is IDENTIFY handling: if for some reason
taskfile_lib_get_identify() fails, buffer _is_ changed and at least
first byte is overwritten. Emulate old behaviour with returning
that first byte to userspace and reporting length=1 despite overall -E.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 9 deletions

diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
index fcd4d8153df5..d711d9b883de 100644
--- a/drivers/ide/ide-floppy_proc.c
+++ b/drivers/ide/ide-floppy_proc.c
@@ -1,22 +1,34 @@
 #include <linux/kernel.h>
 #include <linux/ide.h>
+#include <linux/seq_file.h>
 
 #include "ide-floppy.h"
 
-static int proc_idefloppy_read_capacity(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int idefloppy_capacity_proc_show(struct seq_file *m, void *v)
 {
-        ide_drive_t*drive = (ide_drive_t *)data;
-        int len;
+        ide_drive_t*drive = (ide_drive_t *)m->private;
 
-        len = sprintf(page, "%llu\n", (long long)ide_gd_capacity(drive));
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+        seq_printf(m, "%llu\n", (long long)ide_gd_capacity(drive));
+        return 0;
 }
 
+static int idefloppy_capacity_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, idefloppy_capacity_proc_show, PDE(inode)->data);
+}
+
+static const struct file_operations idefloppy_capacity_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = idefloppy_capacity_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 ide_proc_entry_t ide_floppy_proc[] = {
-        { "capacity",   S_IFREG|S_IRUGO, proc_idefloppy_read_capacity,  NULL },
-        { "geometry",   S_IFREG|S_IRUGO, proc_ide_read_geometry,        NULL },
-        { NULL, 0, NULL, NULL }
+        { "capacity",   S_IFREG|S_IRUGO, &idefloppy_capacity_proc_fops  },
+        { "geometry",   S_IFREG|S_IRUGO, &ide_geometry_proc_fops        },
+        {}
 };
 
 ide_devset_rw_field(bios_cyl, bios_cyl);