diff for duplicates of <4CC449AD.7010503@tremplin-utc.net> diff --git a/a/1.txt b/N1/1.txt index 2b9a36d..74afe13 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,8 @@ Op 22-10-10 13:57, Samu Onkalo schreef: > Configure chip to data ready mode in selftest and count received > interrupts to see that interrupt line(s) are working. > -> Signed-off-by: Samu Onkalo<samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> -Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> +> Signed-off-by: Samu Onkalo<samu.p.onkalo@nokia.com> +Acked-by: Eric Piel <eric.piel@tremplin-utc.net> > --- > drivers/hwmon/lis3lv02d.c | 87 ++++++++++++++++++++++++++++++++++++++++---- > drivers/hwmon/lis3lv02d.h | 3 +- @@ -35,13 +35,13 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > + unsigned char irq_cfg; > > mutex_lock(&lis3->mutex); -> if (lis3_dev.whoami == WAI_12B) +> if (lis3_dev.whoami = WAI_12B) > @@ -205,6 +214,20 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3]) > else > selftest = CTRL1_STP; > > + irq_cfg = lis3->irq_cfg; -> + if (lis3_dev.whoami == WAI_8B) { +> + if (lis3_dev.whoami = WAI_8B) { > + lis3->data_ready_count[IRQ_LINE0] = 0; > + lis3->data_ready_count[IRQ_LINE1] = 0; > + @@ -62,7 +62,7 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > > ret = 0; > + -> + if (lis3_dev.whoami == WAI_8B) { +> + if (lis3_dev.whoami = WAI_8B) { > + /* Restore original interrupt configuration */ > + atomic_dec(&lis3_dev.wake_thread); > + lis3->write(lis3, CTRL_REG3, ctrl_reg_data); @@ -111,10 +111,10 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > struct lis3lv02d *lis3 = data; > + u8 irq_cfg = lis3->irq_cfg& LIS3_IRQ1_MASK; > -> - if ((lis3->irq_cfg& LIS3_IRQ1_MASK) == LIS3_IRQ1_CLICK) -> + if (irq_cfg == LIS3_IRQ1_CLICK) +> - if ((lis3->irq_cfg& LIS3_IRQ1_MASK) = LIS3_IRQ1_CLICK) +> + if (irq_cfg = LIS3_IRQ1_CLICK) > lis302dl_interrupt_handle_click(lis3); -> + else if (unlikely(irq_cfg == LIS3_IRQ1_DATA_READY)) +> + else if (unlikely(irq_cfg = LIS3_IRQ1_DATA_READY)) > + lis302dl_data_ready(lis3, IRQ_LINE0); > else > lis3lv02d_joystick_poll(lis3->idev); @@ -127,10 +127,10 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > struct lis3lv02d *lis3 = data; > + u8 irq_cfg = lis3->irq_cfg& LIS3_IRQ2_MASK; > -> - if ((lis3->irq_cfg& LIS3_IRQ2_MASK) == LIS3_IRQ2_CLICK) -> + if (irq_cfg == LIS3_IRQ2_CLICK) +> - if ((lis3->irq_cfg& LIS3_IRQ2_MASK) = LIS3_IRQ2_CLICK) +> + if (irq_cfg = LIS3_IRQ2_CLICK) > lis302dl_interrupt_handle_click(lis3); -> + else if (unlikely(irq_cfg == LIS3_IRQ2_DATA_READY)) +> + else if (unlikely(irq_cfg = LIS3_IRQ2_DATA_READY)) > + lis302dl_data_ready(lis3, IRQ_LINE1); > else > lis3lv02d_joystick_poll(lis3->idev); @@ -149,7 +149,7 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > + > lis3lv02d_sysfs_poweron(&lis3_dev); > - result = lis3lv02d_selftest(&lis3_dev, values); -> - return sprintf(buf, "%s %d %d %d\n", result == 0 ? "OK" : "FAIL", +> - return sprintf(buf, "%s %d %d %d\n", result = 0 ? "OK" : "FAIL", > + switch (lis3lv02d_selftest(&lis3_dev, values)) { > + case SELFTEST_FAIL: > + res = fail; @@ -180,3 +180,9 @@ Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> > unsigned char irq_cfg; > > struct lis3lv02d_platform_data *pdata; /* for passing board config */ + + +_______________________________________________ +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 c8bcaec..c755a0e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,23 @@ "ref\01287748654-2626-1-git-send-email-samu.p.onkalo@nokia.com\0" "ref\01287748654-2626-11-git-send-email-samu.p.onkalo@nokia.com\0" - "ref\01287748654-2626-11-git-send-email-samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org\0" - "From\0\303\211ric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org>\0" - "Subject\0Re: [PATCH 10/12] hwmon: lis3: Enhance lis3 selftest with IRQ line test\0" - "Date\0Sun, 24 Oct 2010 16:58:53 +0200\0" - "To\0Samu Onkalo <samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\0" - "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org" - guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org - jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org - lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "From\0\303\211ric Piel <eric.piel@tremplin-utc.net>\0" + "Subject\0Re: [lm-sensors] [PATCH 10/12] hwmon: lis3: Enhance lis3 selftest\0" + "Date\0Sun, 24 Oct 2010 14:58:53 +0000\0" + "To\0Samu Onkalo <samu.p.onkalo@nokia.com>\0" + "Cc\0khali@linux-fr.org" + guenter.roeck@ericsson.com + jic23@cam.ac.uk + lm-sensors@lm-sensors.org + linux-i2c@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Op 22-10-10 13:57, Samu Onkalo schreef:\n" "> Configure chip to data ready mode in selftest and count received\n" "> interrupts to see that interrupt line(s) are working.\n" ">\n" - "> Signed-off-by: Samu Onkalo<samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\n" - "Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org>\n" + "> Signed-off-by: Samu Onkalo<samu.p.onkalo@nokia.com>\n" + "Acked-by: Eric Piel <eric.piel@tremplin-utc.net>\n" "> ---\n" "> drivers/hwmon/lis3lv02d.c | 87 ++++++++++++++++++++++++++++++++++++++++----\n" "> drivers/hwmon/lis3lv02d.h | 3 +-\n" @@ -50,13 +49,13 @@ "> +\tunsigned char irq_cfg;\n" ">\n" "> \tmutex_lock(&lis3->mutex);\n" - "> \tif (lis3_dev.whoami == WAI_12B)\n" + "> \tif (lis3_dev.whoami = WAI_12B)\n" "> @@ -205,6 +214,20 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])\n" "> \telse\n" "> \t\tselftest = CTRL1_STP;\n" ">\n" "> +\tirq_cfg = lis3->irq_cfg;\n" - "> +\tif (lis3_dev.whoami == WAI_8B) {\n" + "> +\tif (lis3_dev.whoami = WAI_8B) {\n" "> +\t\tlis3->data_ready_count[IRQ_LINE0] = 0;\n" "> +\t\tlis3->data_ready_count[IRQ_LINE1] = 0;\n" "> +\n" @@ -77,7 +76,7 @@ ">\n" "> \tret = 0;\n" "> +\n" - "> +\tif (lis3_dev.whoami == WAI_8B) {\n" + "> +\tif (lis3_dev.whoami = WAI_8B) {\n" "> +\t\t/* Restore original interrupt configuration */\n" "> +\t\tatomic_dec(&lis3_dev.wake_thread);\n" "> +\t\tlis3->write(lis3, CTRL_REG3, ctrl_reg_data);\n" @@ -126,10 +125,10 @@ "> \tstruct lis3lv02d *lis3 = data;\n" "> +\tu8 irq_cfg = lis3->irq_cfg& LIS3_IRQ1_MASK;\n" ">\n" - "> -\tif ((lis3->irq_cfg& LIS3_IRQ1_MASK) == LIS3_IRQ1_CLICK)\n" - "> +\tif (irq_cfg == LIS3_IRQ1_CLICK)\n" + "> -\tif ((lis3->irq_cfg& LIS3_IRQ1_MASK) = LIS3_IRQ1_CLICK)\n" + "> +\tif (irq_cfg = LIS3_IRQ1_CLICK)\n" "> \t\tlis302dl_interrupt_handle_click(lis3);\n" - "> +\telse if (unlikely(irq_cfg == LIS3_IRQ1_DATA_READY))\n" + "> +\telse if (unlikely(irq_cfg = LIS3_IRQ1_DATA_READY))\n" "> +\t\tlis302dl_data_ready(lis3, IRQ_LINE0);\n" "> \telse\n" "> \t\tlis3lv02d_joystick_poll(lis3->idev);\n" @@ -142,10 +141,10 @@ "> \tstruct lis3lv02d *lis3 = data;\n" "> +\tu8 irq_cfg = lis3->irq_cfg& LIS3_IRQ2_MASK;\n" ">\n" - "> -\tif ((lis3->irq_cfg& LIS3_IRQ2_MASK) == LIS3_IRQ2_CLICK)\n" - "> +\tif (irq_cfg == LIS3_IRQ2_CLICK)\n" + "> -\tif ((lis3->irq_cfg& LIS3_IRQ2_MASK) = LIS3_IRQ2_CLICK)\n" + "> +\tif (irq_cfg = LIS3_IRQ2_CLICK)\n" "> \t\tlis302dl_interrupt_handle_click(lis3);\n" - "> +\telse if (unlikely(irq_cfg == LIS3_IRQ2_DATA_READY))\n" + "> +\telse if (unlikely(irq_cfg = LIS3_IRQ2_DATA_READY))\n" "> +\t\tlis302dl_data_ready(lis3, IRQ_LINE1);\n" "> \telse\n" "> \t\tlis3lv02d_joystick_poll(lis3->idev);\n" @@ -164,7 +163,7 @@ "> +\n" "> \tlis3lv02d_sysfs_poweron(&lis3_dev);\n" "> -\tresult = lis3lv02d_selftest(&lis3_dev, values);\n" - "> -\treturn sprintf(buf, \"%s %d %d %d\\n\", result == 0 ? \"OK\" : \"FAIL\",\n" + "> -\treturn sprintf(buf, \"%s %d %d %d\\n\", result = 0 ? \"OK\" : \"FAIL\",\n" "> +\tswitch (lis3lv02d_selftest(&lis3_dev, values)) {\n" "> +\tcase SELFTEST_FAIL:\n" "> +\t\tres = fail;\n" @@ -194,6 +193,12 @@ "> +\tatomic_t\t\twake_thread;\n" "> \tunsigned char irq_cfg;\n" ">\n" - "> \tstruct lis3lv02d_platform_data *pdata;\t/* for passing board config */" + "> \tstruct lis3lv02d_platform_data *pdata;\t/* for passing board config */\n" + "\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -e8854f95624672fc094197ada14f3316c759540b6ea6f4b9c7a76fbc29f02149 +f27a409f288173d26d398062ef7082da4e91a10ca38f09029f848075eadaac0e
diff --git a/a/1.txt b/N2/1.txt index 2b9a36d..a450cab 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,8 +2,8 @@ Op 22-10-10 13:57, Samu Onkalo schreef: > Configure chip to data ready mode in selftest and count received > interrupts to see that interrupt line(s) are working. > -> Signed-off-by: Samu Onkalo<samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> -Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org> +> Signed-off-by: Samu Onkalo<samu.p.onkalo@nokia.com> +Acked-by: Eric Piel <eric.piel@tremplin-utc.net> > --- > drivers/hwmon/lis3lv02d.c | 87 ++++++++++++++++++++++++++++++++++++++++---- > drivers/hwmon/lis3lv02d.h | 3 +- diff --git a/a/content_digest b/N2/content_digest index c8bcaec..b79d6a7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,23 @@ "ref\01287748654-2626-1-git-send-email-samu.p.onkalo@nokia.com\0" "ref\01287748654-2626-11-git-send-email-samu.p.onkalo@nokia.com\0" - "ref\01287748654-2626-11-git-send-email-samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org\0" - "From\0\303\211ric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org>\0" + "From\0\303\211ric Piel <eric.piel@tremplin-utc.net>\0" "Subject\0Re: [PATCH 10/12] hwmon: lis3: Enhance lis3 selftest with IRQ line test\0" "Date\0Sun, 24 Oct 2010 16:58:53 +0200\0" - "To\0Samu Onkalo <samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\0" - "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org" - guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org - jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org - lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Samu Onkalo <samu.p.onkalo@nokia.com>\0" + "Cc\0khali@linux-fr.org" + guenter.roeck@ericsson.com + jic23@cam.ac.uk + lm-sensors@lm-sensors.org + linux-i2c@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Op 22-10-10 13:57, Samu Onkalo schreef:\n" "> Configure chip to data ready mode in selftest and count received\n" "> interrupts to see that interrupt line(s) are working.\n" ">\n" - "> Signed-off-by: Samu Onkalo<samu.p.onkalo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\n" - "Acked-by: Eric Piel <eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org>\n" + "> Signed-off-by: Samu Onkalo<samu.p.onkalo@nokia.com>\n" + "Acked-by: Eric Piel <eric.piel@tremplin-utc.net>\n" "> ---\n" "> drivers/hwmon/lis3lv02d.c | 87 ++++++++++++++++++++++++++++++++++++++++----\n" "> drivers/hwmon/lis3lv02d.h | 3 +-\n" @@ -196,4 +195,4 @@ ">\n" "> \tstruct lis3lv02d_platform_data *pdata;\t/* for passing board config */" -e8854f95624672fc094197ada14f3316c759540b6ea6f4b9c7a76fbc29f02149 +7065523959813582d44890817570b4fc5d1aa6c4ce2816b1e301889d4b33ff26
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.