diff for duplicates of <55BC147D.4080706@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index a0d9af8..321f48d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -119,7 +119,7 @@ from devicetree maintainers. > > +int set_temp_type(struct nct7802_data *data, int index, u8 type) > +{ -> + if (index = 2 && type != 4) /* RD3 */ +> + if (index == 2 && type != 4) /* RD3 */ > + return -EINVAL; > + if ((type > 0 && type < 3) || type > 4) > + return -EINVAL; @@ -142,7 +142,7 @@ from devicetree maintainers. > + err = kstrtou8(buf, 0, &type); > if (err < 0) > return err; -> - if (sattr->index = 2 && type != 4) /* RD3 */ +> - if (sattr->index == 2 && type != 4) /* RD3 */ > - return -EINVAL; > - if (type < 3 || type > 4) > - return -EINVAL; @@ -169,17 +169,17 @@ from devicetree maintainers. > if (err) > return err; > -> + if (of_property_read_u32(node, "temp1_type", &temp_type) = 0) { +> + if (of_property_read_u32(node, "temp1_type", &temp_type) == 0) { > + err = set_temp_type(data, 0, temp_type); > + if (err) > + return err; > + } -> + if (of_property_read_u32(node, "temp2_type", &temp_type) = 0) { +> + if (of_property_read_u32(node, "temp2_type", &temp_type) == 0) { > + err = set_temp_type(data, 1, temp_type); > + if (err) > + return err; > + } -> + if (of_property_read_u32(node, "temp3_type", &temp_type) = 0) { +> + if (of_property_read_u32(node, "temp3_type", &temp_type) == 0) { > + err = set_temp_type(data, 2, temp_type); > + if (err) > + return err; @@ -217,9 +217,3 @@ from devicetree maintainers. > .detect = nct7802_detect, > .probe = nct7802_probe, > - - -_______________________________________________ -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 44e0065..ed91102 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01438380059-30114-1-git-send-email-const@MakeLinux.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [lm-sensors] [PATCH v1] hwmon: (nct7802) Add device tree support\0" - "Date\0Sat, 01 Aug 2015 00:36:13 +0000\0" + "Subject\0Re: [PATCH v1] hwmon: (nct7802) Add device tree support\0" + "Date\0Fri, 31 Jul 2015 17:36:13 -0700\0" "To\0Constantine Shulyupin <const@makelinux.com>\0" "Cc\0Jean Delvare <jdelvare@suse.com>" lm-sensors@lm-sensors.org @@ -130,7 +130,7 @@ ">\n" "> +int set_temp_type(struct nct7802_data *data, int index, u8 type)\n" "> +{\n" - "> +\tif (index = 2 && type != 4) /* RD3 */\n" + "> +\tif (index == 2 && type != 4) /* RD3 */\n" "> +\t\treturn -EINVAL;\n" "> +\tif ((type > 0 && type < 3) || type > 4)\n" "> +\t\treturn -EINVAL;\n" @@ -153,7 +153,7 @@ "> +\terr = kstrtou8(buf, 0, &type);\n" "> \tif (err < 0)\n" "> \t\treturn err;\n" - "> -\tif (sattr->index = 2 && type != 4) /* RD3 */\n" + "> -\tif (sattr->index == 2 && type != 4) /* RD3 */\n" "> -\t\treturn -EINVAL;\n" "> -\tif (type < 3 || type > 4)\n" "> -\t\treturn -EINVAL;\n" @@ -180,17 +180,17 @@ "> \tif (err)\n" "> \t\treturn err;\n" ">\n" - "> +\tif (of_property_read_u32(node, \"temp1_type\", &temp_type) = 0) {\n" + "> +\tif (of_property_read_u32(node, \"temp1_type\", &temp_type) == 0) {\n" "> +\t\terr = set_temp_type(data, 0, temp_type);\n" "> +\t\tif (err)\n" "> +\t\t\treturn err;\n" "> +\t}\n" - "> +\tif (of_property_read_u32(node, \"temp2_type\", &temp_type) = 0) {\n" + "> +\tif (of_property_read_u32(node, \"temp2_type\", &temp_type) == 0) {\n" "> +\t\terr = set_temp_type(data, 1, temp_type);\n" "> +\t\tif (err)\n" "> +\t\t\treturn err;\n" "> +\t}\n" - "> +\tif (of_property_read_u32(node, \"temp3_type\", &temp_type) = 0) {\n" + "> +\tif (of_property_read_u32(node, \"temp3_type\", &temp_type) == 0) {\n" "> +\t\terr = set_temp_type(data, 2, temp_type);\n" "> +\t\tif (err)\n" "> +\t\t\treturn err;\n" @@ -227,12 +227,6 @@ "> \t},\n" "> \t.detect = nct7802_detect,\n" "> \t.probe = nct7802_probe,\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 + > -4566d2e26d9ca15d12bf7a8f3af8c25b7fad72e7b5e28d441593cd5c6a78d65b +4ad452fdbb8f1fedfda01ce933ad2c6964abaa7035e4184b93abcdac34ed31dd
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.