diff for duplicates of <200504210225.06313.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index ccc8e49..a8c1a41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 10 files changed, 317 insertions(+), 435 deletions(-) Index: dtor/drivers/w1/w1_therm.c -=================================--- dtor.orig/drivers/w1/w1_therm.c +=================================================================== +--- dtor.orig/drivers/w1/w1_therm.c +++ /dev/null @@ -1,188 +0,0 @@ -/* @@ -85,7 +86,7 @@ Index: dtor/drivers/w1/w1_therm.c -{ - int t, h; - -- if (rom[1] = 0) +- if (rom[1] == 0) - t = ((s32)rom[0] >> 1)*1000; - else - t = 1000*(-1*(s32)(0x100-rom[0]) >> 1); @@ -171,7 +172,7 @@ Index: dtor/drivers/w1/w1_therm.c - - crc = w1_calc_crc8(rom, 8); - -- if (rom[8] = crc && rom[0]) +- if (rom[8] == crc && rom[0]) - verdict = 1; - - } @@ -218,7 +219,8 @@ Index: dtor/drivers/w1/w1_therm.c -module_init(w1_therm_init); -module_exit(w1_therm_fini); Index: dtor/drivers/w1/w1_smem.c -=================================--- dtor.orig/drivers/w1/w1_smem.c +=================================================================== +--- dtor.orig/drivers/w1/w1_smem.c +++ /dev/null @@ -1,103 +0,0 @@ -/* @@ -325,7 +327,8 @@ Index: dtor/drivers/w1/w1_smem.c -module_init(w1_smem_init); -module_exit(w1_smem_fini); Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -2,6 +2,7 @@ * w1.c @@ -350,7 +353,8 @@ Index: dtor/drivers/w1/w1.c - return sprintf(buf, "No family registered.\n"); -} - --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 = { @@ -544,7 +548,8 @@ Index: dtor/drivers/w1/w1.c sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); device_unregister(&master->dev); Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -47,7 +47,6 @@ struct w1_reg_num #include "w1_family.h" @@ -566,7 +571,8 @@ Index: dtor/drivers/w1/w1.h #define to_w1_slave(dev) container_of((dev), struct w1_slave, dev) Index: dtor/drivers/w1/w1_thermal.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ dtor/drivers/w1/w1_thermal.c @@ -0,0 +1,173 @@ +/* @@ -608,7 +614,8 @@ Index: dtor/drivers/w1/w1_thermal.c + +static ssize_t w1_thermal_show_temp(struct device *, char *); + -+static struct device_attribute w1_thermal_temperature_attr + __ATTR(temp, S_IRUGO, w1_thermal_show_temp, NULL); ++static struct device_attribute w1_thermal_temperature_attr = ++ __ATTR(temp, S_IRUGO, w1_thermal_show_temp, NULL); + +static int w1_thermal_join(struct w1_slave *slave) +{ @@ -635,7 +642,7 @@ Index: dtor/drivers/w1/w1_thermal.c +{ + int t, h; + -+ if (rom[1] = 0) ++ if (rom[1] == 0) + t = ((s32)rom[0] >> 1) * 1000; + else + t = 1000 * (-1 * (s32)(0x100 - rom[0]) >> 1); @@ -742,7 +749,8 @@ Index: dtor/drivers/w1/w1_thermal.c +module_init(w1_thermal_init); +module_exit(w1_thermal_exit); Index: dtor/drivers/w1/Makefile -=================================--- dtor.orig/drivers/w1/Makefile +=================================================================== +--- dtor.orig/drivers/w1/Makefile +++ dtor/drivers/w1/Makefile @@ -10,8 +10,8 @@ obj-$(CONFIG_W1) += wire.o wire-objs := w1.o w1_family.o w1_io.o @@ -756,7 +764,8 @@ Index: dtor/drivers/w1/Makefile obj-$(CONFIG_W1_DS9490) += ds9490r.o ds9490r-objs := dscore.o Index: dtor/drivers/w1/w1_sernum.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ dtor/drivers/w1/w1_sernum.c @@ -0,0 +1,58 @@ +/* @@ -818,7 +827,8 @@ Index: dtor/drivers/w1/w1_sernum.c +module_init(w1_serial_num_init); +module_exit(w1_serial_num_exit); Index: dtor/drivers/w1/Kconfig -=================================--- dtor.orig/drivers/w1/Kconfig +=================================================================== +--- dtor.orig/drivers/w1/Kconfig +++ dtor/drivers/w1/Kconfig @@ -40,18 +40,19 @@ config W1_DS9490_BRIDGE This support is also available as a module. If so, the module @@ -847,7 +857,8 @@ Index: dtor/drivers/w1/Kconfig endmenu Index: dtor/drivers/w1/w1_family.c -=================================--- dtor.orig/drivers/w1/w1_family.c +=================================================================== +--- dtor.orig/drivers/w1/w1_family.c +++ dtor/drivers/w1/w1_family.c @@ -23,28 +23,18 @@ #include <linux/list.h> @@ -912,7 +923,8 @@ Index: dtor/drivers/w1/w1_family.c { spin_lock(&w1_flock); Index: dtor/drivers/w1/w1_family.h -=================================--- dtor.orig/drivers/w1/w1_family.h +=================================================================== +--- dtor.orig/drivers/w1/w1_family.h +++ dtor/drivers/w1/w1_family.h @@ -26,28 +26,20 @@ #include <linux/device.h> diff --git a/a/content_digest b/N1/content_digest index 0750731..0417ca7 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 18/22] W1: cleanup family implementation\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:25:05 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -36,7 +36,8 @@ " 10 files changed, 317 insertions(+), 435 deletions(-)\n" "\n" "Index: dtor/drivers/w1/w1_therm.c\n" - "=================================--- dtor.orig/drivers/w1/w1_therm.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_therm.c\n" "+++ /dev/null\n" "@@ -1,188 +0,0 @@\n" "-/*\n" @@ -95,7 +96,7 @@ "-{\n" "-\tint t, h;\n" "-\n" - "-\tif (rom[1] = 0)\n" + "-\tif (rom[1] == 0)\n" "-\t\tt = ((s32)rom[0] >> 1)*1000;\n" "-\telse\n" "-\t\tt = 1000*(-1*(s32)(0x100-rom[0]) >> 1);\n" @@ -181,7 +182,7 @@ "-\n" "-\t\t\t\tcrc = w1_calc_crc8(rom, 8);\n" "-\n" - "-\t\t\t\tif (rom[8] = crc && rom[0])\n" + "-\t\t\t\tif (rom[8] == crc && rom[0])\n" "-\t\t\t\t\tverdict = 1;\n" "-\n" "-\t\t\t}\n" @@ -228,7 +229,8 @@ "-module_init(w1_therm_init);\n" "-module_exit(w1_therm_fini);\n" "Index: dtor/drivers/w1/w1_smem.c\n" - "=================================--- dtor.orig/drivers/w1/w1_smem.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_smem.c\n" "+++ /dev/null\n" "@@ -1,103 +0,0 @@\n" "-/*\n" @@ -335,7 +337,8 @@ "-module_init(w1_smem_init);\n" "-module_exit(w1_smem_fini);\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" "@@ -2,6 +2,7 @@\n" " *\tw1.c\n" @@ -360,7 +363,8 @@ "-\treturn sprintf(buf, \"No family registered.\\n\");\n" "-}\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" @@ -554,7 +558,8 @@ " \tsysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);\n" " \tdevice_unregister(&master->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" "@@ -47,7 +47,6 @@ struct w1_reg_num\n" " #include \"w1_family.h\"\n" @@ -576,7 +581,8 @@ " #define to_w1_slave(dev)\tcontainer_of((dev), struct w1_slave, dev)\n" " \n" "Index: dtor/drivers/w1/w1_thermal.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ dtor/drivers/w1/w1_thermal.c\n" "@@ -0,0 +1,173 @@\n" "+/*\n" @@ -618,7 +624,8 @@ "+\n" "+static ssize_t w1_thermal_show_temp(struct device *, char *);\n" "+\n" - "+static struct device_attribute w1_thermal_temperature_attr +\t__ATTR(temp, S_IRUGO, w1_thermal_show_temp, NULL);\n" + "+static struct device_attribute w1_thermal_temperature_attr =\n" + "+\t__ATTR(temp, S_IRUGO, w1_thermal_show_temp, NULL);\n" "+\n" "+static int w1_thermal_join(struct w1_slave *slave)\n" "+{\n" @@ -645,7 +652,7 @@ "+{\n" "+\tint t, h;\n" "+\n" - "+\tif (rom[1] = 0)\n" + "+\tif (rom[1] == 0)\n" "+\t\tt = ((s32)rom[0] >> 1) * 1000;\n" "+\telse\n" "+\t\tt = 1000 * (-1 * (s32)(0x100 - rom[0]) >> 1);\n" @@ -752,7 +759,8 @@ "+module_init(w1_thermal_init);\n" "+module_exit(w1_thermal_exit);\n" "Index: dtor/drivers/w1/Makefile\n" - "=================================--- dtor.orig/drivers/w1/Makefile\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/Makefile\n" "+++ dtor/drivers/w1/Makefile\n" "@@ -10,8 +10,8 @@ obj-$(CONFIG_W1)\t+= wire.o\n" " wire-objs\t\t:= w1.o w1_family.o w1_io.o\n" @@ -766,7 +774,8 @@ " obj-$(CONFIG_W1_DS9490)\t\t+= ds9490r.o\n" " ds9490r-objs := dscore.o\n" "Index: dtor/drivers/w1/w1_sernum.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ dtor/drivers/w1/w1_sernum.c\n" "@@ -0,0 +1,58 @@\n" "+/*\n" @@ -828,7 +837,8 @@ "+module_init(w1_serial_num_init);\n" "+module_exit(w1_serial_num_exit);\n" "Index: dtor/drivers/w1/Kconfig\n" - "=================================--- dtor.orig/drivers/w1/Kconfig\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/Kconfig\n" "+++ dtor/drivers/w1/Kconfig\n" "@@ -40,18 +40,19 @@ config W1_DS9490_BRIDGE\n" " \t This support is also available as a module. If so, the module\n" @@ -857,7 +867,8 @@ " \n" " endmenu\n" "Index: dtor/drivers/w1/w1_family.c\n" - "=================================--- dtor.orig/drivers/w1/w1_family.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_family.c\n" "+++ dtor/drivers/w1/w1_family.c\n" "@@ -23,28 +23,18 @@\n" " #include <linux/list.h>\n" @@ -922,7 +933,8 @@ " {\n" " \tspin_lock(&w1_flock);\n" "Index: dtor/drivers/w1/w1_family.h\n" - "=================================--- dtor.orig/drivers/w1/w1_family.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_family.h\n" "+++ dtor/drivers/w1/w1_family.h\n" "@@ -26,28 +26,20 @@\n" " #include <linux/device.h>\n" @@ -970,4 +982,4 @@ "-\n" #endif /* __W1_FAMILY_H */ -0f922847f3ad71b545b00cafbe5e526b294041bb5f6c12e0c25c0308c48204e9 +c3cb092def5fdcf63d6677f5a0d7719d83bda6a07ff1164a030281cc6e23dfb9
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.