Skip to content

Commit

Permalink
[PATCH] seq_file conversion: toshiba.c
Browse files Browse the repository at this point in the history
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Feb 11, 2007
1 parent 2e7842b commit 967bb77
Showing 1 changed file with 25 additions and 10 deletions.
35 changes: 25 additions & 10 deletions drivers/char/toshiba.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include <linux/init.h>
#include <linux/stat.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>

#include <linux/toshiba.h>

Expand Down Expand Up @@ -298,12 +299,10 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
* Print the information for /proc/toshiba
*/
#ifdef CONFIG_PROC_FS
static int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
static int proc_toshiba_show(struct seq_file *m, void *v)
{
char *temp;
int key;

temp = buffer;
key = tosh_fn_status();

/* Arguments
Expand All @@ -314,18 +313,29 @@ static int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
4) BIOS date (in SCI date format)
5) Fn Key status
*/

temp += sprintf(temp, "1.1 0x%04x %d.%d %d.%d 0x%04x 0x%02x\n",
seq_printf(m, "1.1 0x%04x %d.%d %d.%d 0x%04x 0x%02x\n",
tosh_id,
(tosh_sci & 0xff00)>>8,
tosh_sci & 0xff,
(tosh_bios & 0xff00)>>8,
tosh_bios & 0xff,
tosh_date,
key);
return 0;
}

return temp-buffer;
static int proc_toshiba_open(struct inode *inode, struct file *file)
{
return single_open(file, proc_toshiba_show, NULL);
}

static const struct file_operations proc_toshiba_fops = {
.owner = THIS_MODULE,
.open = proc_toshiba_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
#endif


Expand Down Expand Up @@ -508,10 +518,15 @@ static int __init toshiba_init(void)
return retval;

#ifdef CONFIG_PROC_FS
/* register the proc entry */
if (create_proc_info_entry("toshiba", 0, NULL, tosh_get_info) == NULL) {
misc_deregister(&tosh_device);
return -ENOMEM;
{
struct proc_dir_entry *pde;

pde = create_proc_entry("toshiba", 0, NULL);
if (!pde) {
misc_deregister(&tosh_device);
return -ENOMEM;
}
pde->proc_fops = &proc_toshiba_fops;
}
#endif

Expand Down

0 comments on commit 967bb77

Please sign in to comment.