diff for duplicates of <20090303000412.3c38c266.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 52a700b..6c9d14a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On Tue, 3 Mar 2009 08:47:46 +0100 Jean Delvare <khali@linux-fr.org> wrote: > > "Darrick J. Wong" <djwong@us.ibm.com> wrote: > > > > > @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind, -> > > && (reg_config1 & 0x3f) = 0x00 +> > > && (reg_config1 & 0x3f) == 0x00 > > > && reg_convrate <= 0x07) { > > > kind = max6646; > > > - } @@ -15,7 +15,7 @@ On Tue, 3 Mar 2009 08:47:46 +0100 Jean Delvare <khali@linux-fr.org> wrote: > > > + /* The MAX6648/6692 chips have a working man/chip id > > > + * and the same register set as the 6657. > > > + */ -> > > + if (chip_id = 0x59 && address = 0x4C) +> > > + if (chip_id == 0x59 && address == 0x4C) > > > + kind = max6657; > > > } > > @@ -33,15 +33,15 @@ lol, be serious. > > --- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix > > +++ a/drivers/hwmon/lm90.c > > @@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client -> > && (reg_config1 & 0x3f) = 0x00 +> > && (reg_config1 & 0x3f) == 0x00 > > && reg_convrate <= 0x07) { > > kind = max6646; > > - } else > > - /* The MAX6648/6692 chips have a working man/chip id > > - * and the same register set as the 6657. > > - */ -> > - if (chip_id = 0x59 && address = 0x4C) -> > + } else if (chip_id = 0x59 && address = 0x4C) { +> > - if (chip_id == 0x59 && address == 0x4C) +> > + } else if (chip_id == 0x59 && address == 0x4C) { > > + /* > > + * The MAX6648/6692 chips have a working > > + * man/chip id and the same register set as the @@ -64,9 +64,9 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo LM90_REG_R_CONVRATE)) < 0) return -ENODEV; -- if ((address = 0x4C || address = 0x4D) -- && man_id = 0x01) { /* National Semiconductor */ -+ if ((address = 0x4C || address = 0x4D) && man_id = 0x01) { +- if ((address == 0x4C || address == 0x4D) +- && man_id == 0x01) { /* National Semiconductor */ ++ if ((address == 0x4C || address == 0x4D) && man_id == 0x01) { + /* National Semiconductor */ int reg_config2; @@ -74,20 +74,20 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo LM90_REG_R_CONFIG2)) < 0) return -ENODEV; -- if ((reg_config1 & 0x2A) = 0x00 -- && (reg_config2 & 0xF8) = 0x00 +- if ((reg_config1 & 0x2A) == 0x00 +- && (reg_config2 & 0xF8) == 0x00 - && reg_convrate <= 0x09) { -- if (address = 0x4C -- && (chip_id & 0xF0) = 0x20) { /* LM90 */ -+ if ((reg_config1 & 0x2A) = 0x00 && -+ (reg_config2 & 0xF8) = 0x00 && +- if (address == 0x4C +- && (chip_id & 0xF0) == 0x20) { /* LM90 */ ++ if ((reg_config1 & 0x2A) == 0x00 && ++ (reg_config2 & 0xF8) == 0x00 && + reg_convrate <= 0x09) { -+ if (address = 0x4C && -+ (chip_id & 0xF0) = 0x20) { /* LM90 */ ++ if (address == 0x4C && ++ (chip_id & 0xF0) == 0x20) { /* LM90 */ kind = lm90; - } else -- if ((chip_id & 0xF0) = 0x30) { /* LM89/LM99 */ -+ } else if ((chip_id & 0xF0) = 0x30) { +- if ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */ ++ } else if ((chip_id & 0xF0) == 0x30) { + /* LM89/LM99 */ kind = lm99; dev_info(&adapter->dev, @@ -97,38 +97,38 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo i2c_adapter_id(adapter), address); - } else -- if (address = 0x4C -- && (chip_id & 0xF0) = 0x10) { /* LM86 */ -+ } else if (address = 0x4C && -+ (chip_id & 0xF0) = 0x10) { /* LM86 */ +- if (address == 0x4C +- && (chip_id & 0xF0) == 0x10) { /* LM86 */ ++ } else if (address == 0x4C && ++ (chip_id & 0xF0) == 0x10) { /* LM86 */ kind = lm86; } } - } else -- if ((address = 0x4C || address = 0x4D) -- && man_id = 0x41) { /* Analog Devices */ -- if ((chip_id & 0xF0) = 0x40 /* ADM1032 */ -- && (reg_config1 & 0x3F) = 0x00 +- if ((address == 0x4C || address == 0x4D) +- && man_id == 0x41) { /* Analog Devices */ +- if ((chip_id & 0xF0) == 0x40 /* ADM1032 */ +- && (reg_config1 & 0x3F) == 0x00 - && reg_convrate <= 0x0A) { -+ } else if ((address = 0x4C || address = 0x4D) && -+ man_id = 0x41) { ++ } else if ((address == 0x4C || address == 0x4D) && ++ man_id == 0x41) { + /* Analog Devices */ -+ if ((chip_id & 0xF0) = 0x40 && /* ADM1032 */ -+ (reg_config1 & 0x3F) = 0x00 && ++ if ((chip_id & 0xF0) == 0x40 && /* ADM1032 */ ++ (reg_config1 & 0x3F) == 0x00 && + reg_convrate <= 0x0A) { kind = adm1032; - } else -- if (chip_id = 0x51 /* ADT7461 */ -- && (reg_config1 & 0x1B) = 0x00 +- if (chip_id == 0x51 /* ADT7461 */ +- && (reg_config1 & 0x1B) == 0x00 - && reg_convrate <= 0x0A) { -+ } else if (chip_id = 0x51 && /* ADT7461 */ -+ (reg_config1 & 0x1B) = 0x00 && ++ } else if (chip_id == 0x51 && /* ADT7461 */ ++ (reg_config1 & 0x1B) == 0x00 && + reg_convrate <= 0x0A) { kind = adt7461; } - } else -- if (man_id = 0x4D) { /* Maxim */ -+ } else if (man_id = 0x4D) { /* Maxim */ +- if (man_id == 0x4D) { /* Maxim */ ++ } else if (man_id == 0x4D) { /* Maxim */ /* * The MAX6657, MAX6658 and MAX6659 do NOT have a * chip_id register. Reading from that address will @@ -136,13 +136,13 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo * will be those of the previous read, so in our case * those of the man_id register. */ -- if (chip_id = man_id -- && (address = 0x4C || address = 0x4D) -- && (reg_config1 & 0x1F) = (man_id & 0x0F) +- if (chip_id == man_id +- && (address == 0x4C || address == 0x4D) +- && (reg_config1 & 0x1F) == (man_id & 0x0F) - && reg_convrate <= 0x09) { -+ if (chip_id = man_id && -+ (address = 0x4C || address = 0x4D) && -+ (reg_config1 & 0x1F) = (man_id & 0x0F) && ++ if (chip_id == man_id && ++ (address == 0x4C || address == 0x4D) && ++ (reg_config1 & 0x1F) == (man_id & 0x0F) && + reg_convrate <= 0x09) { kind = max6657; - } else @@ -152,11 +152,11 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo - * and should return zero when read, so should the - * second to last bit of config1 (software reset) - */ -- if (chip_id = 0x01 -- && (reg_config1 & 0x03) = 0x00 +- if (chip_id == 0x01 +- && (reg_config1 & 0x03) == 0x00 - && reg_convrate <= 0x07) { -+ } else if (chip_id = 0x01 && -+ (reg_config1 & 0x03) = 0x00 && ++ } else if (chip_id == 0x01 && ++ (reg_config1 & 0x03) == 0x00 && + reg_convrate <= 0x07) { + /* + * The chip_id register of the MAX6680 and @@ -173,11 +173,11 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo - * The lowest 6 bits of the config1 register are - * unused and should return zero when read. - */ -- if (chip_id = 0x59 -- && (reg_config1 & 0x3f) = 0x00 +- if (chip_id == 0x59 +- && (reg_config1 & 0x3f) == 0x00 - && reg_convrate <= 0x07) { -+ } else if (chip_id = 0x59 && -+ (reg_config1 & 0x3f) = 0x00 && ++ } else if (chip_id == 0x59 && ++ (reg_config1 & 0x3f) == 0x00 && + reg_convrate <= 0x07) { + /* + * The chip_id register of the MAX6646/6647/6649 @@ -186,12 +186,6 @@ diff -puN drivers/hwmon/lm90.c~drivers-hwmon-lm90c-fix-coding-style drivers/hwmo + * unused and should return zero when read. + */ kind = max6646; - } else if (chip_id = 0x59 && address = 0x4C) { + } else if (chip_id == 0x59 && address == 0x4C) { /* _ - - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index d7b1bfc..b0851b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\020090302150426.b22100c1.akpm@linux-foundation.org\0" "ref\020090303084746.14462e04@hyperion.delvare\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" - "Subject\0Re: [lm-sensors] [PATCH] lm90: Support the MAX6648/6692 chips\0" - "Date\0Tue, 03 Mar 2009 08:04:12 +0000\0" + "Subject\0Re: [PATCH] lm90: Support the MAX6648/6692 chips\0" + "Date\0Tue, 3 Mar 2009 00:04:12 -0800\0" "To\0Jean Delvare <khali@linux-fr.org>\0" "Cc\0djwong@us.ibm.com" linux-kernel@vger.kernel.org @@ -19,7 +19,7 @@ "> > \"Darrick J. Wong\" <djwong@us.ibm.com> wrote:\n" "> > \n" "> > > @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind,\n" - "> > > \t\t\t && (reg_config1 & 0x3f) = 0x00\n" + "> > > \t\t\t && (reg_config1 & 0x3f) == 0x00\n" "> > > \t\t\t && reg_convrate <= 0x07) {\n" "> > > \t\t\t\tkind = max6646;\n" "> > > -\t\t\t}\n" @@ -27,7 +27,7 @@ "> > > +\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n" "> > > +\t\t\t * and the same register set as the 6657.\n" "> > > +\t\t\t */\n" - "> > > +\t\t\tif (chip_id = 0x59 && address = 0x4C)\n" + "> > > +\t\t\tif (chip_id == 0x59 && address == 0x4C)\n" "> > > +\t\t\t\tkind = max6657;\n" "> > > \t\t}\n" "> > \n" @@ -45,15 +45,15 @@ "> > --- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix\n" "> > +++ a/drivers/hwmon/lm90.c\n" "> > @@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client\n" - "> > \t\t\t && (reg_config1 & 0x3f) = 0x00\n" + "> > \t\t\t && (reg_config1 & 0x3f) == 0x00\n" "> > \t\t\t && reg_convrate <= 0x07) {\n" "> > \t\t\t\tkind = max6646;\n" "> > -\t\t\t} else\n" "> > -\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n" "> > -\t\t\t * and the same register set as the 6657.\n" "> > -\t\t\t */\n" - "> > -\t\t\tif (chip_id = 0x59 && address = 0x4C)\n" - "> > +\t\t\t} else if (chip_id = 0x59 && address = 0x4C) {\n" + "> > -\t\t\tif (chip_id == 0x59 && address == 0x4C)\n" + "> > +\t\t\t} else if (chip_id == 0x59 && address == 0x4C) {\n" "> > +\t\t\t\t/*\n" "> > +\t\t\t\t * The MAX6648/6692 chips have a working\n" "> > +\t\t\t\t * man/chip id and the same register set as the\n" @@ -76,9 +76,9 @@ " \t\t\t\t\t\tLM90_REG_R_CONVRATE)) < 0)\n" " \t\t\treturn -ENODEV;\n" " \t\t\n" - "-\t\tif ((address = 0x4C || address = 0x4D)\n" - "-\t\t && man_id = 0x01) { /* National Semiconductor */\n" - "+\t\tif ((address = 0x4C || address = 0x4D) && man_id = 0x01) {\n" + "-\t\tif ((address == 0x4C || address == 0x4D)\n" + "-\t\t && man_id == 0x01) { /* National Semiconductor */\n" + "+\t\tif ((address == 0x4C || address == 0x4D) && man_id == 0x01) {\n" "+\t\t\t/* National Semiconductor */\n" " \t\t\tint reg_config2;\n" " \n" @@ -86,20 +86,20 @@ " \t\t\t\t\t\tLM90_REG_R_CONFIG2)) < 0)\n" " \t\t\t\treturn -ENODEV;\n" " \n" - "-\t\t\tif ((reg_config1 & 0x2A) = 0x00\n" - "-\t\t\t && (reg_config2 & 0xF8) = 0x00\n" + "-\t\t\tif ((reg_config1 & 0x2A) == 0x00\n" + "-\t\t\t && (reg_config2 & 0xF8) == 0x00\n" "-\t\t\t && reg_convrate <= 0x09) {\n" - "-\t\t\t\tif (address = 0x4C\n" - "-\t\t\t\t && (chip_id & 0xF0) = 0x20) { /* LM90 */\n" - "+\t\t\tif ((reg_config1 & 0x2A) = 0x00 &&\n" - "+\t\t\t (reg_config2 & 0xF8) = 0x00 &&\n" + "-\t\t\t\tif (address == 0x4C\n" + "-\t\t\t\t && (chip_id & 0xF0) == 0x20) { /* LM90 */\n" + "+\t\t\tif ((reg_config1 & 0x2A) == 0x00 &&\n" + "+\t\t\t (reg_config2 & 0xF8) == 0x00 &&\n" "+\t\t\t reg_convrate <= 0x09) {\n" - "+\t\t\t\tif (address = 0x4C &&\n" - "+\t\t\t\t (chip_id & 0xF0) = 0x20) { /* LM90 */\n" + "+\t\t\t\tif (address == 0x4C &&\n" + "+\t\t\t\t (chip_id & 0xF0) == 0x20) { /* LM90 */\n" " \t\t\t\t\tkind = lm90;\n" "-\t\t\t\t} else\n" - "-\t\t\t\tif ((chip_id & 0xF0) = 0x30) { /* LM89/LM99 */\n" - "+\t\t\t\t} else if ((chip_id & 0xF0) = 0x30) {\n" + "-\t\t\t\tif ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */\n" + "+\t\t\t\t} else if ((chip_id & 0xF0) == 0x30) {\n" "+\t\t\t\t\t/* LM89/LM99 */\n" " \t\t\t\t\tkind = lm99;\n" " \t\t\t\t\tdev_info(&adapter->dev,\n" @@ -109,38 +109,38 @@ " \t\t\t\t\t\t i2c_adapter_id(adapter),\n" " \t\t\t\t\t\t address);\n" "-\t\t\t\t} else\n" - "-\t\t\t\tif (address = 0x4C\n" - "-\t\t\t\t && (chip_id & 0xF0) = 0x10) { /* LM86 */\n" - "+\t\t\t\t} else if (address = 0x4C &&\n" - "+\t\t\t\t\t(chip_id & 0xF0) = 0x10) { /* LM86 */\n" + "-\t\t\t\tif (address == 0x4C\n" + "-\t\t\t\t && (chip_id & 0xF0) == 0x10) { /* LM86 */\n" + "+\t\t\t\t} else if (address == 0x4C &&\n" + "+\t\t\t\t\t(chip_id & 0xF0) == 0x10) { /* LM86 */\n" " \t\t\t\t\tkind = lm86;\n" " \t\t\t\t}\n" " \t\t\t}\n" "-\t\t} else\n" - "-\t\tif ((address = 0x4C || address = 0x4D)\n" - "-\t\t && man_id = 0x41) { /* Analog Devices */\n" - "-\t\t\tif ((chip_id & 0xF0) = 0x40 /* ADM1032 */\n" - "-\t\t\t && (reg_config1 & 0x3F) = 0x00\n" + "-\t\tif ((address == 0x4C || address == 0x4D)\n" + "-\t\t && man_id == 0x41) { /* Analog Devices */\n" + "-\t\t\tif ((chip_id & 0xF0) == 0x40 /* ADM1032 */\n" + "-\t\t\t && (reg_config1 & 0x3F) == 0x00\n" "-\t\t\t && reg_convrate <= 0x0A) {\n" - "+\t\t} else if ((address = 0x4C || address = 0x4D) &&\n" - "+\t\t\t\tman_id = 0x41) {\n" + "+\t\t} else if ((address == 0x4C || address == 0x4D) &&\n" + "+\t\t\t\tman_id == 0x41) {\n" "+\t\t\t/* Analog Devices */\n" - "+\t\t\tif ((chip_id & 0xF0) = 0x40 && /* ADM1032 */\n" - "+\t\t\t (reg_config1 & 0x3F) = 0x00 &&\n" + "+\t\t\tif ((chip_id & 0xF0) == 0x40 && /* ADM1032 */\n" + "+\t\t\t (reg_config1 & 0x3F) == 0x00 &&\n" "+\t\t\t reg_convrate <= 0x0A) {\n" " \t\t\t\tkind = adm1032;\n" "-\t\t\t} else\n" - "-\t\t\tif (chip_id = 0x51 /* ADT7461 */\n" - "-\t\t\t && (reg_config1 & 0x1B) = 0x00\n" + "-\t\t\tif (chip_id == 0x51 /* ADT7461 */\n" + "-\t\t\t && (reg_config1 & 0x1B) == 0x00\n" "-\t\t\t && reg_convrate <= 0x0A) {\n" - "+\t\t\t} else if (chip_id = 0x51 && /* ADT7461 */\n" - "+\t\t\t\t (reg_config1 & 0x1B) = 0x00 &&\n" + "+\t\t\t} else if (chip_id == 0x51 && /* ADT7461 */\n" + "+\t\t\t\t (reg_config1 & 0x1B) == 0x00 &&\n" "+\t\t\t\t reg_convrate <= 0x0A) {\n" " \t\t\t\tkind = adt7461;\n" " \t\t\t}\n" "-\t\t} else\n" - "-\t\tif (man_id = 0x4D) { /* Maxim */\n" - "+\t\t} else if (man_id = 0x4D) { /* Maxim */\n" + "-\t\tif (man_id == 0x4D) { /* Maxim */\n" + "+\t\t} else if (man_id == 0x4D) { /* Maxim */\n" " \t\t\t/*\n" " \t\t\t * The MAX6657, MAX6658 and MAX6659 do NOT have a\n" " \t\t\t * chip_id register. Reading from that address will\n" @@ -148,13 +148,13 @@ " \t\t\t * will be those of the previous read, so in our case\n" " \t\t\t * those of the man_id register.\n" " \t\t\t */\n" - "-\t\t\tif (chip_id = man_id\n" - "-\t\t\t && (address = 0x4C || address = 0x4D)\n" - "-\t\t\t && (reg_config1 & 0x1F) = (man_id & 0x0F)\n" + "-\t\t\tif (chip_id == man_id\n" + "-\t\t\t && (address == 0x4C || address == 0x4D)\n" + "-\t\t\t && (reg_config1 & 0x1F) == (man_id & 0x0F)\n" "-\t\t\t && reg_convrate <= 0x09) {\n" - "+\t\t\tif (chip_id = man_id &&\n" - "+\t\t\t (address = 0x4C || address = 0x4D) &&\n" - "+\t\t\t (reg_config1 & 0x1F) = (man_id & 0x0F) &&\n" + "+\t\t\tif (chip_id == man_id &&\n" + "+\t\t\t (address == 0x4C || address == 0x4D) &&\n" + "+\t\t\t (reg_config1 & 0x1F) == (man_id & 0x0F) &&\n" "+\t\t\t reg_convrate <= 0x09) {\n" " \t\t\t \tkind = max6657;\n" "-\t\t\t} else\n" @@ -164,11 +164,11 @@ "-\t\t\t * and should return zero when read, so should the\n" "-\t\t\t * second to last bit of config1 (software reset)\n" "-\t\t\t */\n" - "-\t\t\tif (chip_id = 0x01\n" - "-\t\t\t && (reg_config1 & 0x03) = 0x00\n" + "-\t\t\tif (chip_id == 0x01\n" + "-\t\t\t && (reg_config1 & 0x03) == 0x00\n" "-\t\t\t && reg_convrate <= 0x07) {\n" - "+\t\t\t} else if (chip_id = 0x01 &&\n" - "+\t\t\t\t\t(reg_config1 & 0x03) = 0x00 &&\n" + "+\t\t\t} else if (chip_id == 0x01 &&\n" + "+\t\t\t\t\t(reg_config1 & 0x03) == 0x00 &&\n" "+\t\t\t\t \treg_convrate <= 0x07) {\n" "+\t\t\t\t/*\n" "+\t\t\t\t * The chip_id register of the MAX6680 and\n" @@ -185,11 +185,11 @@ "-\t\t\t * The lowest 6 bits of the config1 register are\n" "-\t\t\t * unused and should return zero when read.\n" "-\t\t\t */\n" - "-\t\t\tif (chip_id = 0x59\n" - "-\t\t\t && (reg_config1 & 0x3f) = 0x00\n" + "-\t\t\tif (chip_id == 0x59\n" + "-\t\t\t && (reg_config1 & 0x3f) == 0x00\n" "-\t\t\t && reg_convrate <= 0x07) {\n" - "+\t\t\t} else if (chip_id = 0x59 &&\n" - "+\t\t\t\t\t(reg_config1 & 0x3f) = 0x00 &&\n" + "+\t\t\t} else if (chip_id == 0x59 &&\n" + "+\t\t\t\t\t(reg_config1 & 0x3f) == 0x00 &&\n" "+\t\t\t\t\t reg_convrate <= 0x07) {\n" "+\t\t\t\t/*\n" "+\t\t\t\t * The chip_id register of the MAX6646/6647/6649\n" @@ -198,14 +198,8 @@ "+\t\t\t\t * unused and should return zero when read.\n" "+\t\t\t\t */\n" " \t\t\t\tkind = max6646;\n" - " \t\t\t} else if (chip_id = 0x59 && address = 0x4C) {\n" + " \t\t\t} else if (chip_id == 0x59 && address == 0x4C) {\n" " \t\t\t\t/*\n" - "_\n" - "\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + _ -a5a36b39ae789cdcc5a154013a278937e66ca0d68afd9e40405a22ac7e040477 +38b2464c7071196f7a8b3d48a919abb6cf2dbb6133ce92a89dd20fb575ef65a0
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.