Commit 3f025677 authored by Al Viro's avatar Al Viro

sata_svw: switch to ->show_info()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1bb7109a
...@@ -322,23 +322,11 @@ static u8 k2_stat_check_status(struct ata_port *ap) ...@@ -322,23 +322,11 @@ static u8 k2_stat_check_status(struct ata_port *ap)
} }
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
/* static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
* k2_sata_proc_info
* inout : decides on the direction of the dataflow and the meaning of the
* variables
* buffer: If inout==FALSE data is being written to it else read from it
* *start: If inout==FALSE start of the valid data in the buffer
* offset: If inout==FALSE offset from the beginning of the imaginary file
* from which we start writing into the buffer
* length: If inout==FALSE max number of bytes to be written into the buffer
* else number of bytes in the buffer
*/
static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
off_t offset, int count, int inout)
{ {
struct ata_port *ap; struct ata_port *ap;
struct device_node *np; struct device_node *np;
int len, index; int index;
/* Find the ata_port */ /* Find the ata_port */
ap = ata_shost_to_port(shost); ap = ata_shost_to_port(shost);
...@@ -356,15 +344,12 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, ...@@ -356,15 +344,12 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
const u32 *reg = of_get_property(np, "reg", NULL); const u32 *reg = of_get_property(np, "reg", NULL);
if (!reg) if (!reg)
continue; continue;
if (index == *reg) if (index == *reg) {
seq_printf(m, "devspec: %s\n", np->full_name);
break; break;
}
} }
if (np == NULL) return 0;
return 0;
len = sprintf(page, "devspec: %s\n", np->full_name);
return len;
} }
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_OF */
...@@ -372,7 +357,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, ...@@ -372,7 +357,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
static struct scsi_host_template k2_sata_sht = { static struct scsi_host_template k2_sata_sht = {
ATA_BMDMA_SHT(DRV_NAME), ATA_BMDMA_SHT(DRV_NAME),
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
.proc_info = k2_sata_proc_info, .show_info = k2_sata_show_info,
#endif #endif
}; };
......
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