[Linux-kernel-commits] [7396] trunk/arch/blackfin/kernel/cplbinfo.c: cplbinfo: convert custom path parsing to reliable handling via proc_create_data() as pointed out by Al Viro

[vapier]

Title: [7396] trunk/arch/blackfin/kernel/cplbinfo.c: cplbinfo: convert custom path parsing to reliable handling via proc_create_data() as pointed out by Al Viro

Revision

7396

Author

vapier

Date

2009-09-21 12:12:05 -0400 (Mon, 21 Sep 2009)

Log Message

cplbinfo: convert custom path parsing to reliable handling via proc_create_data() as pointed out by Al Viro

Modified Paths

trunk/arch/blackfin/kernel/cplbinfo.c

Diff

Modified: trunk/arch/blackfin/kernel/cplbinfo.c (7395 => 7396)

--- trunk/arch/blackfin/kernel/cplbinfo.c	2009-09-21 11:51:31 UTC (rev 7395)
+++ trunk/arch/blackfin/kernel/cplbinfo.c	2009-09-21 16:12:05 UTC (rev 7396)
@@ -111,24 +111,21 @@
 	.show  = cplbinfo_show,
 };
 
+#define CPLBINFO_DCPLB_FLAG 0x80000000
+
 static int cplbinfo_open(struct inode *inode, struct file *file)
 {
-	char buf[256], *path, *p;
+	struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
+	char cplb_type;
 	unsigned int cpu;
-	char *s_cpu, *s_cplb;
 	int ret;
 	struct seq_file *m;
 	struct cplbinfo_data *cdata;
 
-	path = d_path(&file->f_path, buf, sizeof(buf));
-	if (IS_ERR(path))
-		return PTR_ERR(path);
-	s_cpu = strstr(path, "/cpu");
-	s_cplb = strrchr(path, '/');
-	if (!s_cpu || !s_cplb)
-		return -EINVAL;
+	cpu = (unsigned int)pde->data;
+	cplb_type = cpu & CPLBINFO_DCPLB_FLAG ? 'D' : 'I';
+	cpu &= ~CPLBINFO_DCPLB_FLAG;
 
-	cpu = simple_strtoul(s_cpu + 4, &p, 10);
 	if (!cpu_online(cpu))
 		return -ENODEV;
 
@@ -139,7 +136,7 @@
 	cdata = m->private;
 
 	cdata->pos = 0;
-	cdata->cplb_type = toupper(s_cplb[1]);
+	cdata->cplb_type = cplb_type;
 	cplbinfo_seq_init(cdata, cpu);
 
 	return 0;
@@ -168,8 +165,10 @@
 		if (!cpu_dir)
 			return -ENOMEM;
 
-		proc_create("icplb", S_IRUGO, cpu_dir, &cplbinfo_fops);
-		proc_create("dcplb", S_IRUGO, cpu_dir, &cplbinfo_fops);
+		proc_create_data("icplb", S_IRUGO, cpu_dir, &cplbinfo_fops,
+			(void *)cpu);
+		proc_create_data("dcplb", S_IRUGO, cpu_dir, &cplbinfo_fops,
+			(void *)(cpu | CPLBINFO_DCPLB_FLAG));
 	}
 
 	return 0;

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits