diff for duplicates of <4AFC79B2.6060203@cam.ac.uk> diff --git a/a/1.txt b/N1/1.txt index 659eb27..2fbade9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -381,49 +381,49 @@ see most hwmon drivers.) > + case 0x20: /* -X */ > + if (te9->pdata->negate_x) > + dir = 0x10; -> + if (te9->pdata->axis_map_y == 0) +> + if (te9->pdata->axis_map_y = 0) > + dir >>= 2; -> + if (te9->pdata->axis_map_z == 0) +> + if (te9->pdata->axis_map_z = 0) > + dir >>= 4; > + break; > + case 0x10: /* +X */ > + if (te9->pdata->negate_x) > + dir = 0x20; -> + if (te9->pdata->axis_map_y == 0) +> + if (te9->pdata->axis_map_y = 0) > + dir >>= 2; -> + if (te9->pdata->axis_map_z == 0) +> + if (te9->pdata->axis_map_z = 0) > + dir >>= 4; > + break; > + case 0x08: /* -Y */ > + if (te9->pdata->negate_y) > + dir = 0x04; -> + if (te9->pdata->axis_map_x == 1) +> + if (te9->pdata->axis_map_x = 1) > + dir <<= 2; -> + if (te9->pdata->axis_map_z == 1) +> + if (te9->pdata->axis_map_z = 1) > + dir >>= 2; > + break; > + case 0x04: /* +Y */ > + if (te9->pdata->negate_y) > + dir = 0x08; -> + if (te9->pdata->axis_map_x == 1) +> + if (te9->pdata->axis_map_x = 1) > + dir <<= 2; -> + if (te9->pdata->axis_map_z == 1) +> + if (te9->pdata->axis_map_z = 1) > + dir >>= 2; > + break; > + case 0x02: /* -Z */ > + if (te9->pdata->negate_z) > + dir = 0x01; -> + if (te9->pdata->axis_map_x == 2) +> + if (te9->pdata->axis_map_x = 2) > + dir <<= 4; -> + if (te9->pdata->axis_map_y == 2) +> + if (te9->pdata->axis_map_y = 2) > + dir <<= 2; > + break; > + case 0x01: /* +Z */ > + if (te9->pdata->negate_z) > + dir = 0x02; -> + if (te9->pdata->axis_map_x == 2) +> + if (te9->pdata->axis_map_x = 2) > + dir <<= 4; -> + if (te9->pdata->axis_map_y == 2) +> + if (te9->pdata->axis_map_y = 2) > + dir <<= 2; > + break; > + default: @@ -501,9 +501,8 @@ Some brackets might make this more readable? (I for one can never remember the p > + !(b2s_comp & wuf_comp)) { > + /* set the new poll interval based on wuf odr */ > + for (i = 1; i < ARRAY_SIZE(kxte9_odr_table); i++) { -> + te9->pdata->poll_interval = -> + kxte9_odr_table[i - 1].cutoff; -> + if (kxte9_odr_table[i].mask == wuf_comp << 3) +> + te9->pdata->poll_interval > + kxte9_odr_table[i - 1].cutoff; +> + if (kxte9_odr_table[i].mask = wuf_comp << 3) > + break; > + } > + if (te9->input_dev) { @@ -525,9 +524,8 @@ Some brackets might make this more readable? (I for one can never remember the p > + !(b2s_comp & wuf_comp)) { > + /* set the new poll interval based on b2s odr */ > + for (i = 1; i < ARRAY_SIZE(kxte9_odr_table); i++) { -> + te9->pdata->poll_interval = -> + kxte9_odr_table[i - 1].cutoff; -> + if (kxte9_odr_table[i].mask == b2s_comp << 3) +> + te9->pdata->poll_interval > + kxte9_odr_table[i - 1].cutoff; +> + if (kxte9_odr_table[i].mask = b2s_comp << 3) > + break; > + } > + if (te9->input_dev) { @@ -882,9 +880,9 @@ data then it is their own fault. Still, I guess it does no harm. > + te9->pdata->min_interval); > + if (te9->pdata->axis_map_x > 2 || > + te9->pdata->axis_map_y > 2 || te9->pdata->axis_map_z > 2 || -> + te9->pdata->axis_map_x == te9->pdata->axis_map_y || -> + te9->pdata->axis_map_x == te9->pdata->axis_map_z || -> + te9->pdata->axis_map_y == te9->pdata->axis_map_z) { +> + te9->pdata->axis_map_x = te9->pdata->axis_map_y || +> + te9->pdata->axis_map_x = te9->pdata->axis_map_z || +> + te9->pdata->axis_map_y = te9->pdata->axis_map_z) { > + dev_err(&te9->client->dev, > + "invalid axis_map value x:%u y:%u z:%u\n", > + te9->pdata->axis_map_x, te9->pdata->axis_map_y, @@ -957,7 +955,7 @@ Might be worth checking whether something so generic is appropriate. > + struct kxte9_data *te9; > + int err = -1; > + -> + if (client->dev.platform_data == NULL) { +> + if (client->dev.platform_data = NULL) { > + dev_err(&client->dev, "platform data is NULL. exiting.\n"); > + err = -ENODEV; > + goto err0; @@ -968,7 +966,7 @@ Might be worth checking whether something so generic is appropriate. > + goto err0; > + } > + te9 = kzalloc(sizeof(*te9), GFP_KERNEL); -> + if (te9 == NULL) { +> + if (te9 = NULL) { > + dev_err(&client->dev, > + "failed to allocate memory for module data\n"); > + err = -ENOMEM; @@ -989,7 +987,7 @@ to justify not using the main kernel one. > + goto err1; > + } > + te9->pdata = kmalloc(sizeof(*te9->pdata), GFP_KERNEL); -> + if (te9->pdata == NULL) +> + if (te9->pdata = NULL) > + goto err2; > + memcpy(te9->pdata, client->dev.platform_data, sizeof(*te9->pdata)); > + err = kxte9_validate_pdata(te9); @@ -1261,3 +1259,9 @@ use them as parameters it would be much cleaner. > + > +#endif /* __KXTE9_H__ */ > + + + +_______________________________________________ +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 35a0143..317e685 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\01257877729-25647-1-git-send-email-chudson@kionix.com\0" "From\0Jonathan Cameron <jic23@cam.ac.uk>\0" - "Subject\0Re: [lm-sensors] [RFC PATCH 1/3] hwmon:driver support for Kionix kxte9\taccelerometer\0" + "Subject\0Re: [lm-sensors] [RFC PATCH 1/3] hwmon:driver support for Kionix\0" "Date\0Thu, 12 Nov 2009 21:10:10 +0000\0" "To\0chudson@kionix.com\0" "Cc\0LM Sensors <lm-sensors@lm-sensors.org>" @@ -390,49 +390,49 @@ "> +\tcase 0x20:\t/* -X */\n" "> +\t\tif (te9->pdata->negate_x)\n" "> +\t\t\tdir = 0x10;\n" - "> +\t\tif (te9->pdata->axis_map_y == 0)\n" + "> +\t\tif (te9->pdata->axis_map_y = 0)\n" "> +\t\t\tdir >>= 2;\n" - "> +\t\tif (te9->pdata->axis_map_z == 0)\n" + "> +\t\tif (te9->pdata->axis_map_z = 0)\n" "> +\t\t\tdir >>= 4;\n" "> +\t\tbreak;\n" "> +\tcase 0x10:\t/* +X */\n" "> +\t\tif (te9->pdata->negate_x)\n" "> +\t\t\tdir = 0x20;\n" - "> +\t\tif (te9->pdata->axis_map_y == 0)\n" + "> +\t\tif (te9->pdata->axis_map_y = 0)\n" "> +\t\t\tdir >>= 2;\n" - "> +\t\tif (te9->pdata->axis_map_z == 0)\n" + "> +\t\tif (te9->pdata->axis_map_z = 0)\n" "> +\t\t\tdir >>= 4;\n" "> +\t\tbreak;\n" "> +\tcase 0x08:\t/* -Y */\n" "> +\t\tif (te9->pdata->negate_y)\n" "> +\t\t\tdir = 0x04;\n" - "> +\t\tif (te9->pdata->axis_map_x == 1)\n" + "> +\t\tif (te9->pdata->axis_map_x = 1)\n" "> +\t\t\tdir <<= 2;\n" - "> +\t\tif (te9->pdata->axis_map_z == 1)\n" + "> +\t\tif (te9->pdata->axis_map_z = 1)\n" "> +\t\t\tdir >>= 2;\n" "> +\t\tbreak;\n" "> +\tcase 0x04:\t/* +Y */\n" "> +\t\tif (te9->pdata->negate_y)\n" "> +\t\t\tdir = 0x08;\n" - "> +\t\tif (te9->pdata->axis_map_x == 1)\n" + "> +\t\tif (te9->pdata->axis_map_x = 1)\n" "> +\t\t\tdir <<= 2;\n" - "> +\t\tif (te9->pdata->axis_map_z == 1)\n" + "> +\t\tif (te9->pdata->axis_map_z = 1)\n" "> +\t\t\tdir >>= 2;\n" "> +\t\tbreak;\n" "> +\tcase 0x02:\t/* -Z */\n" "> +\t\tif (te9->pdata->negate_z)\n" "> +\t\t\tdir = 0x01;\n" - "> +\t\tif (te9->pdata->axis_map_x == 2)\n" + "> +\t\tif (te9->pdata->axis_map_x = 2)\n" "> +\t\t\tdir <<= 4;\n" - "> +\t\tif (te9->pdata->axis_map_y == 2)\n" + "> +\t\tif (te9->pdata->axis_map_y = 2)\n" "> +\t\t\tdir <<= 2;\n" "> +\t\tbreak;\n" "> +\tcase 0x01:\t/* +Z */\n" "> +\t\tif (te9->pdata->negate_z)\n" "> +\t\t\tdir = 0x02;\n" - "> +\t\tif (te9->pdata->axis_map_x == 2)\n" + "> +\t\tif (te9->pdata->axis_map_x = 2)\n" "> +\t\t\tdir <<= 4;\n" - "> +\t\tif (te9->pdata->axis_map_y == 2)\n" + "> +\t\tif (te9->pdata->axis_map_y = 2)\n" "> +\t\t\tdir <<= 2;\n" "> +\t\tbreak;\n" "> +\tdefault:\n" @@ -510,9 +510,8 @@ "> +\t\t\t\t\t\t!(b2s_comp & wuf_comp)) {\n" "> +\t\t\t/* set the new poll interval based on wuf odr */\n" "> +\t\t\tfor (i = 1; i < ARRAY_SIZE(kxte9_odr_table); i++) {\n" - "> +\t\t\t\tte9->pdata->poll_interval =\n" - "> +\t\t\t\t\t\tkxte9_odr_table[i - 1].cutoff;\n" - "> +\t\t\t\tif (kxte9_odr_table[i].mask ==\twuf_comp << 3)\n" + "> +\t\t\t\tte9->pdata->poll_interval > +\t\t\t\t\t\tkxte9_odr_table[i - 1].cutoff;\n" + "> +\t\t\t\tif (kxte9_odr_table[i].mask =\twuf_comp << 3)\n" "> +\t\t\t\t\t\tbreak;\n" "> +\t\t\t}\n" "> +\t\t\tif (te9->input_dev) {\n" @@ -534,9 +533,8 @@ "> +\t\t\t\t\t\t!(b2s_comp & wuf_comp)) {\n" "> +\t\t\t/* set the new poll interval based on b2s odr */\n" "> +\t\t\tfor (i = 1; i < ARRAY_SIZE(kxte9_odr_table); i++) {\n" - "> +\t\t\t\tte9->pdata->poll_interval =\n" - "> +\t\t\t\t\t\tkxte9_odr_table[i - 1].cutoff;\n" - "> +\t\t\t\tif (kxte9_odr_table[i].mask == b2s_comp << 3)\n" + "> +\t\t\t\tte9->pdata->poll_interval > +\t\t\t\t\t\tkxte9_odr_table[i - 1].cutoff;\n" + "> +\t\t\t\tif (kxte9_odr_table[i].mask = b2s_comp << 3)\n" "> +\t\t\t\t\t\tbreak;\n" "> +\t\t\t}\n" "> +\t\t\tif (te9->input_dev) {\n" @@ -891,9 +889,9 @@ "> +\t\t\t\t\tte9->pdata->min_interval);\n" "> +\tif (te9->pdata->axis_map_x > 2 ||\n" "> +\t te9->pdata->axis_map_y > 2 || te9->pdata->axis_map_z > 2 ||\n" - "> +\t te9->pdata->axis_map_x == te9->pdata->axis_map_y ||\n" - "> +\t te9->pdata->axis_map_x == te9->pdata->axis_map_z ||\n" - "> +\t te9->pdata->axis_map_y == te9->pdata->axis_map_z) {\n" + "> +\t te9->pdata->axis_map_x = te9->pdata->axis_map_y ||\n" + "> +\t te9->pdata->axis_map_x = te9->pdata->axis_map_z ||\n" + "> +\t te9->pdata->axis_map_y = te9->pdata->axis_map_z) {\n" "> +\t\tdev_err(&te9->client->dev,\n" "> +\t\t\t\"invalid axis_map value x:%u y:%u z:%u\\n\",\n" "> +\t\t\tte9->pdata->axis_map_x, te9->pdata->axis_map_y,\n" @@ -966,7 +964,7 @@ "> +\tstruct kxte9_data *te9;\n" "> +\tint err = -1;\n" "> +\n" - "> +\tif (client->dev.platform_data == NULL) {\n" + "> +\tif (client->dev.platform_data = NULL) {\n" "> +\t\tdev_err(&client->dev, \"platform data is NULL. exiting.\\n\");\n" "> +\t\terr = -ENODEV;\n" "> +\t\tgoto err0;\n" @@ -977,7 +975,7 @@ "> +\t\tgoto err0;\n" "> +\t}\n" "> +\tte9 = kzalloc(sizeof(*te9), GFP_KERNEL);\n" - "> +\tif (te9 == NULL) {\n" + "> +\tif (te9 = NULL) {\n" "> +\t\tdev_err(&client->dev,\n" "> +\t\t\t\"failed to allocate memory for module data\\n\");\n" "> +\t\terr = -ENOMEM;\n" @@ -998,7 +996,7 @@ "> +\t\tgoto err1;\n" "> +\t}\n" "> +\tte9->pdata = kmalloc(sizeof(*te9->pdata), GFP_KERNEL);\n" - "> +\tif (te9->pdata == NULL)\n" + "> +\tif (te9->pdata = NULL)\n" "> +\t\tgoto err2;\n" "> +\tmemcpy(te9->pdata, client->dev.platform_data, sizeof(*te9->pdata));\n" "> +\terr = kxte9_validate_pdata(te9);\n" @@ -1269,6 +1267,12 @@ "> +#endif /* __KERNEL__ */\n" "> +\n" "> +#endif /* __KXTE9_H__ */\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 -69bf39d86db60c0e680e0ec20e00de022e1ade2b5ee4774b8f4c685c1fb966ea +8e8c34d258757800a19bb92c314aac1cfb38f12ca13ca97c8860edd8b9c366d2
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.