diff for duplicates of <200504210210.12524.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index fa440ab..4699108 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2 files changed, 81 insertions(+), 35 deletions(-) Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -81,40 +81,6 @@ static void w1_master_release(struct dev complete(&md->dev_released); @@ -35,9 +36,11 @@ Index: dtor/drivers/w1/w1.c - return sprintf(buf, "No family registered.\n"); -} - --static struct device_attribute w1_slave_attribute - __ATTR(name, S_IRUGO, w1_default_read_name, NULL); +-static struct device_attribute w1_slave_attribute = +- __ATTR(name, S_IRUGO, w1_default_read_name, NULL); - --static struct device_attribute w1_slave_attribute_val - __ATTR(value, S_IRUGO, w1_default_read_name, NULL); +-static struct device_attribute w1_slave_attribute_val = +- __ATTR(value, S_IRUGO, w1_default_read_name, NULL); - -static struct bin_attribute w1_slave_bin_attribute = { - .attr = { @@ -99,9 +102,11 @@ Index: dtor/drivers/w1/w1.c + return sprintf(buf, "No family registered.\n"); +} + -+static struct device_attribute w1_slave_attribute + __ATTR(name, S_IRUGO, w1_default_read_name, NULL); ++static struct device_attribute w1_slave_attribute = ++ __ATTR(name, S_IRUGO, w1_default_read_name, NULL); + -+static struct device_attribute w1_slave_attribute_val + __ATTR(value, S_IRUGO, w1_default_read_name, NULL); ++static struct device_attribute w1_slave_attribute_val = ++ __ATTR(value, S_IRUGO, w1_default_read_name, NULL); + +static struct bin_attribute w1_slave_bin_attribute = { + .attr = { @@ -153,7 +158,8 @@ Index: dtor/drivers/w1/w1.c device_remove_file(&sl->dev, &sl->attr_val); device_unregister(&sl->dev); Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -81,6 +81,7 @@ struct w1_slave struct bin_attribute attr_bin; diff --git a/a/content_digest b/N1/content_digest index db5731c..bde588a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" "Subject\0[RFC/PATCH 4/22] W1: use attribute group for slave's attributes\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:10:11 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -21,7 +21,8 @@ " 2 files changed, 81 insertions(+), 35 deletions(-)\n" "\n" "Index: dtor/drivers/w1/w1.c\n" - "=================================--- dtor.orig/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" "+++ dtor/drivers/w1/w1.c\n" "@@ -81,40 +81,6 @@ static void w1_master_release(struct dev\n" " \tcomplete(&md->dev_released);\n" @@ -45,9 +46,11 @@ "-\treturn sprintf(buf, \"No family registered.\\n\");\n" "-}\n" "-\n" - "-static struct device_attribute w1_slave_attribute -\t__ATTR(name, S_IRUGO, w1_default_read_name, NULL);\n" + "-static struct device_attribute w1_slave_attribute =\n" + "-\t__ATTR(name, S_IRUGO, w1_default_read_name, NULL);\n" "-\n" - "-static struct device_attribute w1_slave_attribute_val -\t__ATTR(value, S_IRUGO, w1_default_read_name, NULL);\n" + "-static struct device_attribute w1_slave_attribute_val =\n" + "-\t__ATTR(value, S_IRUGO, w1_default_read_name, NULL);\n" "-\n" "-static struct bin_attribute w1_slave_bin_attribute = {\n" "-\t.attr = {\n" @@ -109,9 +112,11 @@ "+\treturn sprintf(buf, \"No family registered.\\n\");\n" "+}\n" "+\n" - "+static struct device_attribute w1_slave_attribute +\t__ATTR(name, S_IRUGO, w1_default_read_name, NULL);\n" + "+static struct device_attribute w1_slave_attribute =\n" + "+\t__ATTR(name, S_IRUGO, w1_default_read_name, NULL);\n" "+\n" - "+static struct device_attribute w1_slave_attribute_val +\t__ATTR(value, S_IRUGO, w1_default_read_name, NULL);\n" + "+static struct device_attribute w1_slave_attribute_val =\n" + "+\t__ATTR(value, S_IRUGO, w1_default_read_name, NULL);\n" "+\n" "+static struct bin_attribute w1_slave_bin_attribute = {\n" "+\t.attr = {\n" @@ -163,7 +168,8 @@ " \tdevice_remove_file(&sl->dev, &sl->attr_val);\n" " \tdevice_unregister(&sl->dev);\n" "Index: dtor/drivers/w1/w1.h\n" - "=================================--- dtor.orig/drivers/w1/w1.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.h\n" "+++ dtor/drivers/w1/w1.h\n" "@@ -81,6 +81,7 @@ struct w1_slave\n" " \tstruct bin_attribute\tattr_bin;\n" @@ -173,4 +179,4 @@ " \n" typedef void (* w1_slave_found_callback)(unsigned long, u64); -8151c6d95eec84c18be35ac81c5c7d336969ce31f97c3be3680b9dc49cfe8fd7 +724ed15fe4e91bdb0e296ad93d2481f05822cb415bd807fd2d74e0377606d72c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.