diff for duplicates of <20130710182508.GD22430@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 9489488..f830445 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -130,7 +130,7 @@ Guenter > + &data->temp11[TEMP11_LOCAL_TEMP]); > } else { > if (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP, -> &h) == 0) +> &h) = 0) > - data->temp11[4] = h << 8; > + data->temp11[TEMP11_LOCAL_TEMP] = h << 8; > } @@ -139,33 +139,32 @@ Guenter > + LM90_REG_R_REMOTE_TEMPL, > + &data->temp11[TEMP11_REMOTE_TEMP]); > -> if (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &h) == 0) { +> if (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &h) = 0) { > - data->temp11[1] = h << 8; > + data->temp11[TEMP11_REMOTE_LOW] = h << 8; > if ((data->flags & LM90_HAVE_REM_LIMIT_EXT) > && lm90_read_reg(client, LM90_REG_R_REMOTE_LOWL, -> &l) == 0) +> &l) = 0) > - data->temp11[1] |= l; > + data->temp11[TEMP11_REMOTE_LOW] |= l; > } -> if (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &h) == 0) { +> if (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &h) = 0) { > - data->temp11[2] = h << 8; > + data->temp11[TEMP11_REMOTE_HIGH] = h << 8; > if ((data->flags & LM90_HAVE_REM_LIMIT_EXT) > && lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHL, -> &l) == 0) +> &l) = 0) > - data->temp11[2] |= l; > + data->temp11[TEMP11_REMOTE_HIGH] |= l; > } > > if (data->flags & LM90_HAVE_OFFSET) { > @@ -529,13 +570,14 @@ static struct lm90_data *lm90_update_device(struct device *dev) -> &h) == 0 +> &h) = 0 > && lm90_read_reg(client, LM90_REG_R_REMOTE_OFFSL, -> &l) == 0) +> &l) = 0) > - data->temp11[3] = (h << 8) | l; -> + data->temp11[TEMP11_REMOTE_OFFSET] = -> + (h << 8) | l; +> + data->temp11[TEMP11_REMOTE_OFFSET] > + (h << 8) | l; > } > if (data->flags & LM90_HAVE_EMERGENCY) { > lm90_read_reg(client, MAX6659_REG_R_LOCAL_EMERG, @@ -178,7 +177,7 @@ Guenter > lm90_read_reg(client, LM90_REG_R_STATUS, &alarms); > data->alarms = alarms; /* save as 16 bit value */ > @@ -543,15 +585,16 @@ static struct lm90_data *lm90_update_device(struct device *dev) -> if (data->kind == max6696) { +> if (data->kind = max6696) { > lm90_select_remote_channel(client, data, 1); > lm90_read_reg(client, LM90_REG_R_REMOTE_CRIT, > - &data->temp8[6]); @@ -220,11 +219,11 @@ Guenter > @@ -925,11 +968,12 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy, > > mutex_lock(&data->update_lock); -> if (data->kind == adt7461) +> if (data->kind = adt7461) > - temp = temp_from_u8_adt7461(data, data->temp8[2]); > + temp = temp_from_u8_adt7461(data, > + data->temp8[TEMP8_LOCAL_CRIT]); -> else if (data->kind == max6646) +> else if (data->kind = max6646) > - temp = temp_from_u8(data->temp8[2]); > + temp = temp_from_u8(data->temp8[TEMP8_LOCAL_CRIT]); > else @@ -322,4 +321,9 @@ Guenter > -- > 1.7.9.5 > -> +> + +_______________________________________________ +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 ce4acd9..775216f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01373455539-2831-1-git-send-email-wni@nvidia.com\0" "ref\01373455539-2831-4-git-send-email-wni@nvidia.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [PATCH v2 3/3] hwmon: (lm90) use enums for the indexes of temp8 and temp11\0" - "Date\0Wed, 10 Jul 2013 11:25:08 -0700\0" + "Subject\0Re: [lm-sensors] [PATCH v2 3/3] hwmon: (lm90) use enums for the indexes of temp8 and temp11\0" + "Date\0Wed, 10 Jul 2013 18:25:08 +0000\0" "To\0Wei Ni <wni@nvidia.com>\0" "Cc\0khali@linux-fr.org" swarren@wwwdotorg.org @@ -144,7 +144,7 @@ "> +\t\t\t\t &data->temp11[TEMP11_LOCAL_TEMP]);\n" "> \t\t} else {\n" "> \t\t\tif (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP,\n" - "> \t\t\t\t\t &h) == 0)\n" + "> \t\t\t\t\t &h) = 0)\n" "> -\t\t\t\tdata->temp11[4] = h << 8;\n" "> +\t\t\t\tdata->temp11[TEMP11_LOCAL_TEMP] = h << 8;\n" "> \t\t}\n" @@ -153,33 +153,32 @@ "> +\t\t\tLM90_REG_R_REMOTE_TEMPL,\n" "> +\t\t\t&data->temp11[TEMP11_REMOTE_TEMP]);\n" "> \n" - "> \t\tif (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &h) == 0) {\n" + "> \t\tif (lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH, &h) = 0) {\n" "> -\t\t\tdata->temp11[1] = h << 8;\n" "> +\t\t\tdata->temp11[TEMP11_REMOTE_LOW] = h << 8;\n" "> \t\t\tif ((data->flags & LM90_HAVE_REM_LIMIT_EXT)\n" "> \t\t\t && lm90_read_reg(client, LM90_REG_R_REMOTE_LOWL,\n" - "> \t\t\t\t\t &l) == 0)\n" + "> \t\t\t\t\t &l) = 0)\n" "> -\t\t\t\tdata->temp11[1] |= l;\n" "> +\t\t\t\tdata->temp11[TEMP11_REMOTE_LOW] |= l;\n" "> \t\t}\n" - "> \t\tif (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &h) == 0) {\n" + "> \t\tif (lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHH, &h) = 0) {\n" "> -\t\t\tdata->temp11[2] = h << 8;\n" "> +\t\t\tdata->temp11[TEMP11_REMOTE_HIGH] = h << 8;\n" "> \t\t\tif ((data->flags & LM90_HAVE_REM_LIMIT_EXT)\n" "> \t\t\t && lm90_read_reg(client, LM90_REG_R_REMOTE_HIGHL,\n" - "> \t\t\t\t\t &l) == 0)\n" + "> \t\t\t\t\t &l) = 0)\n" "> -\t\t\t\tdata->temp11[2] |= l;\n" "> +\t\t\t\tdata->temp11[TEMP11_REMOTE_HIGH] |= l;\n" "> \t\t}\n" "> \n" "> \t\tif (data->flags & LM90_HAVE_OFFSET) {\n" "> @@ -529,13 +570,14 @@ static struct lm90_data *lm90_update_device(struct device *dev)\n" - "> \t\t\t\t\t &h) == 0\n" + "> \t\t\t\t\t &h) = 0\n" "> \t\t\t && lm90_read_reg(client, LM90_REG_R_REMOTE_OFFSL,\n" - "> \t\t\t\t\t &l) == 0)\n" + "> \t\t\t\t\t &l) = 0)\n" "> -\t\t\t\tdata->temp11[3] = (h << 8) | l;\n" - "> +\t\t\t\tdata->temp11[TEMP11_REMOTE_OFFSET] =\n" - "> +\t\t\t\t\t\t\t\t(h << 8) | l;\n" + "> +\t\t\t\tdata->temp11[TEMP11_REMOTE_OFFSET] > +\t\t\t\t\t\t\t\t(h << 8) | l;\n" "> \t\t}\n" "> \t\tif (data->flags & LM90_HAVE_EMERGENCY) {\n" "> \t\t\tlm90_read_reg(client, MAX6659_REG_R_LOCAL_EMERG,\n" @@ -192,7 +191,7 @@ "> \t\tlm90_read_reg(client, LM90_REG_R_STATUS, &alarms);\n" "> \t\tdata->alarms = alarms;\t/* save as 16 bit value */\n" "> @@ -543,15 +585,16 @@ static struct lm90_data *lm90_update_device(struct device *dev)\n" - "> \t\tif (data->kind == max6696) {\n" + "> \t\tif (data->kind = max6696) {\n" "> \t\t\tlm90_select_remote_channel(client, data, 1);\n" "> \t\t\tlm90_read_reg(client, LM90_REG_R_REMOTE_CRIT,\n" "> -\t\t\t\t &data->temp8[6]);\n" @@ -234,11 +233,11 @@ "> @@ -925,11 +968,12 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,\n" "> \n" "> \tmutex_lock(&data->update_lock);\n" - "> \tif (data->kind == adt7461)\n" + "> \tif (data->kind = adt7461)\n" "> -\t\ttemp = temp_from_u8_adt7461(data, data->temp8[2]);\n" "> +\t\ttemp = temp_from_u8_adt7461(data,\n" "> +\t\t\t\t\tdata->temp8[TEMP8_LOCAL_CRIT]);\n" - "> \telse if (data->kind == max6646)\n" + "> \telse if (data->kind = max6646)\n" "> -\t\ttemp = temp_from_u8(data->temp8[2]);\n" "> +\t\ttemp = temp_from_u8(data->temp8[TEMP8_LOCAL_CRIT]);\n" "> \telse\n" @@ -336,6 +335,11 @@ "> -- \n" "> 1.7.9.5\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 -5dd0f40cb83f67596c3fb83b953e60069860eec94a4b8bb1595ed3a453b3c2a3 +c06c8d7b4172917d17e180c3b3dbc1daf469fff97150325fafe598d4074a1e5f
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.