diff for duplicates of <200504210208.06123.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index 1f84fe8..8966d3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 18 files changed, 173 insertions(+), 173 deletions(-) Index: dtor/drivers/w1/ds_w1_bridge.c -=================================--- dtor.orig/drivers/w1/ds_w1_bridge.c +=================================================================== +--- dtor.orig/drivers/w1/ds_w1_bridge.c +++ dtor/drivers/w1/ds_w1_bridge.c @@ -1,8 +1,8 @@ /* @@ -79,7 +80,8 @@ Index: dtor/drivers/w1/ds_w1_bridge.c err = w1_add_master_device(ds_bus_master); Index: dtor/drivers/w1/w1_io.h -=================================--- dtor.orig/drivers/w1/w1_io.h +=================================================================== +--- dtor.orig/drivers/w1/w1_io.h +++ dtor/drivers/w1/w1_io.h @@ -1,8 +1,8 @@ /* @@ -93,7 +95,8 @@ Index: dtor/drivers/w1/w1_io.h * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: dtor/drivers/w1/w1_therm.c -=================================--- dtor.orig/drivers/w1/w1_therm.c +=================================================================== +--- dtor.orig/drivers/w1/w1_therm.c +++ dtor/drivers/w1/w1_therm.c @@ -1,8 +1,8 @@ /* @@ -121,7 +124,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); @@ -167,7 +170,8 @@ Index: dtor/drivers/w1/w1_therm.c out: up(&dev->mutex); Index: dtor/drivers/w1/w1_netlink.h -=================================--- dtor.orig/drivers/w1/w1_netlink.h +=================================================================== +--- dtor.orig/drivers/w1/w1_netlink.h +++ dtor/drivers/w1/w1_netlink.h @@ -33,13 +33,13 @@ enum w1_netlink_message_types { W1_MASTER_REMOVE, @@ -186,7 +190,8 @@ Index: dtor/drivers/w1/w1_netlink.h struct { Index: dtor/drivers/w1/dscore.h -=================================--- dtor.orig/drivers/w1/dscore.h +=================================================================== +--- dtor.orig/drivers/w1/dscore.h +++ dtor/drivers/w1/dscore.h @@ -1,8 +1,8 @@ /* @@ -209,7 +214,8 @@ Index: dtor/drivers/w1/dscore.h int ep[NUM_EP]; Index: dtor/drivers/w1/w1_int.c -=================================--- dtor.orig/drivers/w1/w1_int.c +=================================================================== +--- dtor.orig/drivers/w1/w1_int.c +++ dtor/drivers/w1/w1_int.c @@ -1,8 +1,8 @@ /* @@ -244,7 +250,8 @@ Index: dtor/drivers/w1/w1_int.c atomic_set(&dev->refcnt, 2); Index: dtor/drivers/w1/Makefile -=================================--- dtor.orig/drivers/w1/Makefile +=================================================================== +--- dtor.orig/drivers/w1/Makefile +++ dtor/drivers/w1/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_W1_MATROX) += matrox_w1.o obj-$(CONFIG_W1_THERM) += w1_therm.o @@ -256,7 +263,8 @@ Index: dtor/drivers/w1/Makefile obj-$(CONFIG_W1_DS9490_BRIDGE) += ds_w1_bridge.o Index: dtor/drivers/w1/matrox_w1.c -=================================--- dtor.orig/drivers/w1/matrox_w1.c +=================================================================== +--- dtor.orig/drivers/w1/matrox_w1.c +++ dtor/drivers/w1/matrox_w1.c @@ -1,8 +1,8 @@ /* @@ -290,7 +298,8 @@ Index: dtor/drivers/w1/matrox_w1.c dev->phys_addr = pci_resource_start(pdev, 1); Index: dtor/drivers/w1/w1_smem.c -=================================--- dtor.orig/drivers/w1/w1_smem.c +=================================================================== +--- dtor.orig/drivers/w1/w1_smem.c +++ dtor/drivers/w1/w1_smem.c @@ -1,8 +1,8 @@ /* @@ -331,7 +340,8 @@ Index: dtor/drivers/w1/w1_smem.c up(&sl->master->mutex); out_dec: 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 @@ -1,8 +1,8 @@ /* @@ -345,7 +355,8 @@ Index: dtor/drivers/w1/w1_family.c * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -1,8 +1,8 @@ /* @@ -493,7 +504,7 @@ Index: dtor/drivers/w1/w1.c + spin_lock_irq(&w1_mlock); list_for_each_entry(dev, &w1_masters, w1_master_entry) { - if (dev->bus_master->data = data) { + if (dev->bus_master->data == data) { @@ -500,7 +500,7 @@ void w1_slave_found(unsigned long data, data); return; @@ -504,7 +515,7 @@ Index: dtor/drivers/w1/w1.c slave_count = 0; @@ -527,7 +527,7 @@ void w1_slave_found(unsigned long data, - if(((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7)) + if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); } - @@ -531,7 +542,8 @@ Index: dtor/drivers/w1/w1.c list_for_each_safe(ent, n, &dev->slist) { Index: dtor/drivers/w1/w1_log.h -=================================--- dtor.orig/drivers/w1/w1_log.h +=================================================================== +--- dtor.orig/drivers/w1/w1_log.h +++ dtor/drivers/w1/w1_log.h @@ -1,8 +1,8 @@ /* @@ -545,7 +557,8 @@ Index: dtor/drivers/w1/w1_log.h * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: dtor/drivers/w1/w1_io.c -=================================--- dtor.orig/drivers/w1/w1_io.c +=================================================================== +--- dtor.orig/drivers/w1/w1_io.c +++ dtor/drivers/w1/w1_io.c @@ -1,8 +1,8 @@ /* @@ -559,7 +572,8 @@ Index: dtor/drivers/w1/w1_io.c * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: dtor/drivers/w1/w1_int.h -=================================--- dtor.orig/drivers/w1/w1_int.h +=================================================================== +--- dtor.orig/drivers/w1/w1_int.h +++ dtor/drivers/w1/w1_int.h @@ -1,8 +1,8 @@ /* @@ -573,7 +587,8 @@ Index: dtor/drivers/w1/w1_int.h * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 @@ -1,8 +1,8 @@ /* @@ -608,7 +623,8 @@ Index: dtor/drivers/w1/w1_family.h u8 need_exit; }; Index: dtor/drivers/w1/dscore.c -=================================--- dtor.orig/drivers/w1/dscore.c +=================================================================== +--- dtor.orig/drivers/w1/dscore.c +++ dtor/drivers/w1/dscore.c @@ -1,8 +1,8 @@ /* @@ -858,7 +874,7 @@ Index: dtor/drivers/w1/dscore.c + ds_start_pulse(dev, PULLUP_PULSE_DURATION); - return !(byte = rbyte); + return !(byte == rbyte); @@ -470,11 +470,11 @@ int ds_read_bit(struct ds_device *dev, u err = ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE); if (err) @@ -923,7 +939,7 @@ Index: dtor/drivers/w1/dscore.c ds_start_pulse(dev, PULLUP_PULSE_DURATION); - + - return !(err = len); + return !(err == len); } @@ -559,11 +559,11 @@ int ds_search(struct ds_device *dev, u64 @@ -1053,7 +1069,8 @@ Index: dtor/drivers/w1/dscore.c */ #if 0 Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -1,8 +1,8 @@ /* @@ -1130,7 +1147,8 @@ Index: dtor/drivers/w1/w1.h int w1_create_master_attributes(struct w1_master *); Index: dtor/drivers/w1/Kconfig -=================================--- dtor.orig/drivers/w1/Kconfig +=================================================================== +--- dtor.orig/drivers/w1/Kconfig +++ dtor/drivers/w1/Kconfig @@ -3,9 +3,9 @@ menu "Dallas's 1-wire bus" config W1 diff --git a/a/content_digest b/N1/content_digest index de556da..e73f5d5 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 1/22] W1: whitespace fixes\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:08:05 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -34,7 +34,8 @@ " 18 files changed, 173 insertions(+), 173 deletions(-)\n" "\n" "Index: dtor/drivers/w1/ds_w1_bridge.c\n" - "=================================--- dtor.orig/drivers/w1/ds_w1_bridge.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/ds_w1_bridge.c\n" "+++ dtor/drivers/w1/ds_w1_bridge.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -89,7 +90,8 @@ " \n" " \terr = w1_add_master_device(ds_bus_master);\n" "Index: dtor/drivers/w1/w1_io.h\n" - "=================================--- dtor.orig/drivers/w1/w1_io.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_io.h\n" "+++ dtor/drivers/w1/w1_io.h\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -103,7 +105,8 @@ " * This program is free software; you can redistribute it and/or modify\n" " * it under the terms of the GNU General Public License as published by\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" "+++ dtor/drivers/w1/w1_therm.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -131,7 +134,7 @@ " \tint t, h;\n" "-\t\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" @@ -177,7 +180,8 @@ " out:\n" " \tup(&dev->mutex);\n" "Index: dtor/drivers/w1/w1_netlink.h\n" - "=================================--- dtor.orig/drivers/w1/w1_netlink.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_netlink.h\n" "+++ dtor/drivers/w1/w1_netlink.h\n" "@@ -33,13 +33,13 @@ enum w1_netlink_message_types {\n" " \tW1_MASTER_REMOVE,\n" @@ -196,7 +200,8 @@ " \t\tstruct\n" " \t\t{\n" "Index: dtor/drivers/w1/dscore.h\n" - "=================================--- dtor.orig/drivers/w1/dscore.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/dscore.h\n" "+++ dtor/drivers/w1/dscore.h\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -219,7 +224,8 @@ " \n" " \tint\t\t\tep[NUM_EP];\n" "Index: dtor/drivers/w1/w1_int.c\n" - "=================================--- dtor.orig/drivers/w1/w1_int.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_int.c\n" "+++ dtor/drivers/w1/w1_int.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -254,7 +260,8 @@ " \n" " \tatomic_set(&dev->refcnt, 2);\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" "@@ -13,7 +13,7 @@ obj-$(CONFIG_W1_MATROX)\t\t+= matrox_w1.o\n" " obj-$(CONFIG_W1_THERM)\t\t+= w1_therm.o\n" @@ -266,7 +273,8 @@ " \n" " obj-$(CONFIG_W1_DS9490_BRIDGE)\t+= ds_w1_bridge.o\n" "Index: dtor/drivers/w1/matrox_w1.c\n" - "=================================--- dtor.orig/drivers/w1/matrox_w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/matrox_w1.c\n" "+++ dtor/drivers/w1/matrox_w1.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -300,7 +308,8 @@ " \n" " \tdev->phys_addr = pci_resource_start(pdev, 1);\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" "+++ dtor/drivers/w1/w1_smem.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -341,7 +350,8 @@ " \tup(&sl->master->mutex);\n" " out_dec:\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" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -355,7 +365,8 @@ " * This program is free software; you can redistribute it and/or modify\n" " * it under the terms of the GNU General Public License as published by\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" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -503,7 +514,7 @@ "+\n" " \tspin_lock_irq(&w1_mlock);\n" " \tlist_for_each_entry(dev, &w1_masters, w1_master_entry) {\n" - " \t\tif (dev->bus_master->data = data) {\n" + " \t\tif (dev->bus_master->data == data) {\n" "@@ -500,7 +500,7 @@ void w1_slave_found(unsigned long data, \n" " \t\t\t\tdata);\n" " \t\treturn;\n" @@ -514,7 +525,7 @@ " \n" " \tslave_count = 0;\n" "@@ -527,7 +527,7 @@ void w1_slave_found(unsigned long data, \n" - " \t\t\tif(((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7))\n" + " \t\t\tif(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7))\n" " \t\t\t\tw1_attach_slave_device(dev, (struct w1_reg_num *) &rn);\n" " \t}\n" "-\t\t\t\n" @@ -541,7 +552,8 @@ " \n" " \t\tlist_for_each_safe(ent, n, &dev->slist) {\n" "Index: dtor/drivers/w1/w1_log.h\n" - "=================================--- dtor.orig/drivers/w1/w1_log.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_log.h\n" "+++ dtor/drivers/w1/w1_log.h\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -555,7 +567,8 @@ " * This program is free software; you can redistribute it and/or modify\n" " * it under the terms of the GNU General Public License as published by\n" "Index: dtor/drivers/w1/w1_io.c\n" - "=================================--- dtor.orig/drivers/w1/w1_io.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_io.c\n" "+++ dtor/drivers/w1/w1_io.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -569,7 +582,8 @@ " * This program is free software; you can redistribute it and/or modify\n" " * it under the terms of the GNU General Public License as published by\n" "Index: dtor/drivers/w1/w1_int.h\n" - "=================================--- dtor.orig/drivers/w1/w1_int.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_int.h\n" "+++ dtor/drivers/w1/w1_int.h\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -583,7 +597,8 @@ " * This program is free software; you can redistribute it and/or modify\n" " * it under the terms of the GNU General Public License as published by\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" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -618,7 +633,8 @@ " \tu8\t\t\tneed_exit;\n" " };\n" "Index: dtor/drivers/w1/dscore.c\n" - "=================================--- dtor.orig/drivers/w1/dscore.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/dscore.c\n" "+++ dtor/drivers/w1/dscore.c\n" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -868,7 +884,7 @@ "+\n" " \tds_start_pulse(dev, PULLUP_PULSE_DURATION);\n" " \n" - " \treturn !(byte = rbyte);\n" + " \treturn !(byte == rbyte);\n" "@@ -470,11 +470,11 @@ int ds_read_bit(struct ds_device *dev, u\n" " \terr = ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE);\n" " \tif (err)\n" @@ -933,7 +949,7 @@ " \tds_start_pulse(dev, PULLUP_PULSE_DURATION);\n" "-\t\n" "+\n" - " \treturn !(err = len);\n" + " \treturn !(err == len);\n" " }\n" " \n" "@@ -559,11 +559,11 @@ int ds_search(struct ds_device *dev, u64\n" @@ -1063,7 +1079,8 @@ " */\n" " #if 0\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" "@@ -1,8 +1,8 @@\n" " /*\n" @@ -1140,7 +1157,8 @@ " \n" " int w1_create_master_attributes(struct w1_master *);\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" "@@ -3,9 +3,9 @@ menu \"Dallas's 1-wire bus\"\n" " config W1\n" @@ -1193,4 +1211,4 @@ " \n" endmenu -6f720e63d2285529fc0832f1c600e817774c0777d66a3379bf4030ea10d3fdc1 +31b617c25803312097b9a159d5be264f65ec600088c489fc4d66664fc566c69c
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.