diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-08 15:25:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-08 15:25:44 -0800 |
| commit | cecb1fe37f1d961501123db547d7841bd94a1380 (patch) | |
| tree | 069cba705ed541eb76f4a40633d2f62ba43bd518 /gregkh | |
| parent | 641f475ca2cc3d4e38e9361cd22b86d3a414b397 (diff) | |
| download | patches-cecb1fe37f1d961501123db547d7841bd94a1380.tar.gz | |
sysfs-test patch updates
Diffstat (limited to 'gregkh')
| -rw-r--r-- | gregkh/sysfs-test.patch | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gregkh/sysfs-test.patch b/gregkh/sysfs-test.patch index 325012bc665f7..bdc36104cab26 100644 --- a/gregkh/sysfs-test.patch +++ b/gregkh/sysfs-test.patch @@ -6,17 +6,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/Makefile | 2 drivers/gregkh/Makefile | 1 - drivers/gregkh/gregkh.c | 307 ++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 310 insertions(+) + drivers/gregkh/gregkh.c | 311 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 314 insertions(+) --- --- /dev/null +++ gregkh-2.6/drivers/gregkh/gregkh.c -@@ -0,0 +1,307 @@ +@@ -0,0 +1,311 @@ +/* + * greg kroah-hartman's junk module + * -+ * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com> ++ * Copyright (C) 2004-2006 Greg Kroah-Hartman <greg@kroah.com> + * + * The place I use to mess around with new ideas... + * @@ -35,6 +35,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#include <linux/kdev_t.h> +#include <linux/device.h> + ++#define dbg(format, arg...) \ ++ printk(KERN_ERR "GREGKH: " format , ## arg) ++ +struct greg { + struct kobject kobj; + u32 a; @@ -64,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + struct greg *g = to_greg(kobj); + ssize_t ret = 0; + -+ printk("GREG: %s kobj=%p g=%p\n", __FUNCTION__, kobj, g); ++ dbg("%s kobj=%p g=%p\n", __FUNCTION__, kobj, g); + if (g_attr->show) + ret = g_attr->show(g, buf, g_attr->offset); + return ret; @@ -106,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + void *v = g; + u32 *val = offset + v; -+ printk("GREG: %s val=%p\n", __FUNCTION__, val); ++ dbg("%s val=%p\n", __FUNCTION__, val); + return sprintf(buf, "%d\n", *val); +} + @@ -114,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + void *v = g; + u16 *val = offset + v; -+ printk("GREG: %s val=%p\n", __FUNCTION__, val); ++ dbg("%s val=%p\n", __FUNCTION__, val); + return sprintf(buf, "%d\n", *val); +} + @@ -122,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + void *v = g; + u8 *val = offset + v; -+ printk("GREG: %s val=%p\n", __FUNCTION__, val); ++ dbg("%s val=%p\n", __FUNCTION__, val); + return sprintf(buf, "%d\n", *val); +} + @@ -130,7 +133,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + void *v = g; + void **val = offset + v; -+ printk("GREG: %s val=%p\n", __FUNCTION__, val); ++ dbg("%s val=%p\n", __FUNCTION__, val); + return sprintf(buf, "%p\n", *val); +} + @@ -236,6 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + struct class_device *g2; + struct class_device *cd; ++ struct class_device *dup; + + greg_class = class_create(THIS_MODULE, "gregkh"); + @@ -243,9 +247,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + g2 = class_device_create(greg_class, NULL, MKDEV(42, 1), NULL, "greg2"); + class_device_create(greg_class, NULL, MKDEV(42, 2), NULL, "greg3"); + -+ printk("GREG: create a dupe name\n"); -+ class_device_create(greg_class, NULL, MKDEV(42, 3), NULL, "greg1"); -+ printk("GREG: dup name created\n"); ++ dbg("create a dupe name\n"); ++ dup = class_device_create(greg_class, NULL, MKDEV(42, 3), NULL, "greg1"); ++ dbg("dup name created, dup = %p\n", dup); + + class_device_create(greg_class, g2, MKDEV(42,4), NULL, "greg2.4"); + class_device_create(greg_class, g2, 0, NULL, "greg2.%s", "null"); @@ -261,7 +265,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + error = subsystem_register(&gregkh_subsys); + if (error) { -+ printk("GREG: error %d\n", error); ++ dbg("error %d\n", error); + return error; + } + @@ -296,8 +300,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +// error = sysfs_create_file(&g2->kobj, &d_attr.attr); + error = sysfs_create_group(&g1->kobj, &g_attr_group); + error = sysfs_create_group(&g2->kobj, &g_attr_group); -+ printk("GREG: %s g1=%p\n", __FUNCTION__, g1); -+ printk("GREG: %s g2=%p\n", __FUNCTION__, g2); ++ dbg("%s g1=%p\n", __FUNCTION__, g1); ++ dbg("%s g2=%p\n", __FUNCTION__, g2); + + greg_class_init(); + |