diff for duplicates of <55DF22BA.7080306@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 292d4fd..940a522 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ There is only one group with a variable number of attributes. > +static int fam15h_power_init_attrs(struct pci_dev *pdev) > { > - /* power1_input is only reported for Fam15h, Models 00h-0fh */ -> - if (attr = &dev_attr_power1_input.attr && +> - if (attr == &dev_attr_power1_input.attr && > - (boot_cpu_data.x86 != 0x15 || boot_cpu_data.x86_model > 0xf)) > - return 0; > + int n = FAM15H_MIN_POWER_GROUPS; @@ -46,7 +46,7 @@ There is only one group with a variable number of attributes. > > - return attr->mode; > -} -> + if (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf) +> + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > + n += 1; > > -static struct attribute *fam15h_power_attrs[] = { @@ -74,7 +74,7 @@ No need for another one. > + > + n = 0; > + fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; -> + if (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf) +> + if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > + fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; > + > + fam15h_power_group.attrs = fam15h_power_attrs; @@ -104,9 +104,3 @@ This should return the error code from fam15h_power_init_attrs(). > data->pdev = pdev; > > - - -_______________________________________________ -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 50d7bae..a8d20f9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01440662866-28716-1-git-send-email-ray.huang@amd.com\0" "ref\01440662866-28716-4-git-send-email-ray.huang@amd.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [lm-sensors] [PATCH 03/15] hwmon, fam15h_power: refactor attributes for dynamically added\0" - "Date\0Thu, 27 Aug 2015 14:46:18 +0000\0" + "Subject\0Re: [PATCH 03/15] hwmon, fam15h_power: refactor attributes for dynamically added\0" + "Date\0Thu, 27 Aug 2015 07:46:18 -0700\0" "To\0Huang Rui <ray.huang@amd.com>" Borislav Petkov <bp@suse.de> Jean Delvare <jdelvare@suse.de> @@ -66,7 +66,7 @@ "> +static int fam15h_power_init_attrs(struct pci_dev *pdev)\n" "> {\n" "> -\t/* power1_input is only reported for Fam15h, Models 00h-0fh */\n" - "> -\tif (attr = &dev_attr_power1_input.attr &&\n" + "> -\tif (attr == &dev_attr_power1_input.attr &&\n" "> -\t (boot_cpu_data.x86 != 0x15 || boot_cpu_data.x86_model > 0xf))\n" "> -\t\treturn 0;\n" "> +\tint n = FAM15H_MIN_POWER_GROUPS;\n" @@ -74,7 +74,7 @@ ">\n" "> -\treturn attr->mode;\n" "> -}\n" - "> +\tif (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf)\n" + "> +\tif (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)\n" "> +\t\tn += 1;\n" ">\n" "> -static struct attribute *fam15h_power_attrs[] = {\n" @@ -102,7 +102,7 @@ "> +\n" "> +\tn = 0;\n" "> +\tfam15h_power_attrs[n++] = &dev_attr_power1_crit.attr;\n" - "> +\tif (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf)\n" + "> +\tif (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)\n" "> +\t\tfam15h_power_attrs[n++] = &dev_attr_power1_input.attr;\n" "> +\n" "> +\tfam15h_power_group.attrs = fam15h_power_attrs;\n" @@ -131,12 +131,6 @@ "> \tfam15h_power_init_data(pdev, data);\n" "> \tdata->pdev = pdev;\n" ">\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 + > -a5ae548b3924cf265d787db6dcb627d12ae61b159ddc8827fd62e57d783992f5 +99fbc110c31b18d2d7ef15efe8addc7364694635f268d02af376c97823ac2670
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.