scsi: bury ->proc_info()
all users converted to ->show_info()/->write_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 6f4c3cf..1670ba7 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -45,58 +45,6 @@
/* Protect sht->present and sht->proc_dir */
static DEFINE_MUTEX(global_host_template_mutex);
-/**
- * proc_scsi_read - handle read from /proc by calling host's proc_info() command
- * @buffer: passed to proc_info
- * @start: passed to proc_info
- * @offset: passed to proc_info
- * @length: passed to proc_info
- * @eof: returns whether length read was less than requested
- * @data: pointer to a &struct Scsi_Host
- */
-
-static int proc_scsi_read(char *buffer, char **start, off_t offset,
- int length, int *eof, void *data)
-{
- struct Scsi_Host *shost = data;
- int n;
-
- n = shost->hostt->proc_info(shost, buffer, start, offset, length, 0);
- *eof = (n < length);
-
- return n;
-}
-
-/**
- * proc_scsi_write_proc - Handle write to /proc by calling host's proc_info()
- * @file: not used
- * @buf: source of data to write.
- * @count: number of bytes (at most PROC_BLOCK_SIZE) to write.
- * @data: pointer to &struct Scsi_Host
- */
-static int proc_scsi_write_proc(struct file *file, const char __user *buf,
- unsigned long count, void *data)
-{
- struct Scsi_Host *shost = data;
- ssize_t ret = -ENOMEM;
- char *page;
- char *start;
-
- if (count > PROC_BLOCK_SIZE)
- return -EOVERFLOW;
-
- page = (char *)__get_free_page(GFP_KERNEL);
- if (page) {
- ret = -EFAULT;
- if (copy_from_user(page, buf, count))
- goto out;
- ret = shost->hostt->proc_info(shost, page, &start, 0, count, 1);
- }
-out:
- free_page((unsigned long)page);
- return ret;
-}
-
static ssize_t proc_scsi_host_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
@@ -149,7 +97,7 @@
void scsi_proc_hostdir_add(struct scsi_host_template *sht)
{
- if (!sht->proc_info && !sht->show_info)
+ if (!sht->show_info)
return;
mutex_lock(&global_host_template_mutex);
@@ -168,7 +116,7 @@
*/
void scsi_proc_hostdir_rm(struct scsi_host_template *sht)
{
- if (!sht->proc_info && !sht->show_info)
+ if (!sht->show_info)
return;
mutex_lock(&global_host_template_mutex);
@@ -194,23 +142,12 @@
return;
sprintf(name,"%d", shost->host_no);
- if (sht->show_info) {
- p = proc_create_data(name, S_IRUGO | S_IWUSR,
- sht->proc_dir, &proc_scsi_fops, shost);
- if (!p)
- goto Fail;
- return;
- }
- p = create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
- sht->proc_dir, proc_scsi_read, shost);
- if (p) {
- p->write_proc = proc_scsi_write_proc;
- return;
- }
-Fail:
- printk(KERN_ERR "%s: Failed to register host %d in"
- "%s\n", __func__, shost->host_no,
- sht->proc_name);
+ p = proc_create_data(name, S_IRUGO | S_IWUSR,
+ sht->proc_dir, &proc_scsi_fops, shost);
+ if (!p)
+ printk(KERN_ERR "%s: Failed to register host %d in"
+ "%s\n", __func__, shost->host_no,
+ sht->proc_name);
}
/**