diff for duplicates of <488766F4.20603@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c799ef2..0b65655 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -294,8 +294,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ +}; + +/* Read all inputs in one spi message */ -+static const char read_all_tx_array[] = -+{ ++static const char read_all_tx_array[] +{ + 0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_L_ADDRESS), + 0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_H_ADDRESS), + 0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_Y_L_ADDRESS), @@ -399,13 +398,13 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + }; + + xfer.tx_buf = kmalloc(4, GFP_KERNEL); -+ if (xfer.tx_buf == NULL) { ++ if (xfer.tx_buf = NULL) { + ret = -ENOMEM; + goto error_ret; + } + + xfer.rx_buf = kmalloc(4, GFP_KERNEL); -+ if (xfer.rx_buf == NULL) { ++ if (xfer.rx_buf = NULL) { + ret = -ENOMEM; + goto error_free_tx; + } @@ -486,7 +485,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + int ret; + + local_tx_buf = kmalloc(4, GFP_KERNEL); -+ if (local_tx_buf == NULL) { ++ if (local_tx_buf = NULL) { + ret = -ENOMEM; + goto error_ret; + } @@ -535,7 +534,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + + tval.val = value; + local_tx_buf = kmalloc(4, GFP_KERNEL); -+ if (local_tx_buf == NULL) { ++ if (local_tx_buf = NULL) { + ret = -ENOMEM; + goto error_ret; + } @@ -586,12 +585,12 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + }, + }; + local_tx_buf = kmalloc(4, GFP_KERNEL); -+ if (local_tx_buf == NULL) { ++ if (local_tx_buf = NULL) { + ret = -ENOMEM; + goto error_ret; + } + local_rx_buf = kmalloc(4, GFP_KERNEL); -+ if (local_rx_buf == NULL) { ++ if (local_rx_buf = NULL) { + ret = -ENOMEM; + goto error_free_tx_buf; + } @@ -756,7 +755,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + int element; + + mutex_lock(&indio_dev->mlock); -+ if (indio_dev->currentmode == INDIO_RING_DATA_RDY) { ++ if (indio_dev->currentmode = INDIO_RING_DATA_RDY) { + switch (this_attr->address) { + case LIS3L02DQ_REG_OUT_X_L_ADDRESS: + element = 0; @@ -823,11 +822,11 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + if (ret) + goto error_ret; + t &= LIS3L02DQ_DEC_MASK; -+ if (t == LIS3L02DQ_REG_CTRL_1_DF_128) ++ if (t = LIS3L02DQ_REG_CTRL_1_DF_128) + len = sprintf(buf, "280"); -+ else if (t == LIS3L02DQ_REG_CTRL_1_DF_64) ++ else if (t = LIS3L02DQ_REG_CTRL_1_DF_64) + len = sprintf(buf, "560"); -+ else if (t == LIS3L02DQ_REG_CTRL_1_DF_32) ++ else if (t = LIS3L02DQ_REG_CTRL_1_DF_32) + len = sprintf(buf, "1120"); + else + len = sprintf(buf, "4480"); @@ -1016,7 +1015,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + int8_t valold, controlold; + bool val; + -+ val = (buf[0] == '0') ? 0 : 1; ++ val = (buf[0] = '0') ? 0 : 1; + + mutex_lock(&indio_dev->mlock); + /* read current value */ @@ -1033,13 +1032,13 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + if (ret) + goto error_mutex_unlock; + currentlyset = valold & this_attr->mask ? 1 : 0; -+ if (val == false && currentlyset) { ++ if (val = false && currentlyset) { + valold &= ~this_attr->mask; + changed = 1; + ret = iio_remove_event_from_list(this_attr->listel); + if (ret) + goto error_mutex_unlock; -+ } else if (val == true && !currentlyset) { ++ } else if (val = true && !currentlyset) { + changed = 1; + valold |= this_attr->mask; + /* move to a line spec rather than this? */ @@ -1115,7 +1114,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + = valold & LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION + ? 1 : 0; + /* if set, disable requested and ring buffer not in use (FIXME) */ -+ if (state == 0 && currentlyset) { ++ if (state = 0 && currentlyset) { + valold &= ~LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION; + ret = iio_remove_event_from_list(list); + if (ret) @@ -1154,7 +1153,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + struct iio_event_attr *this_attr = to_iio_event_attr(attr); + + mutex_lock(&indio_dev->mlock); -+ if (indio_dev->currentmode == INDIO_RING_DATA_RDY) ++ if (indio_dev->currentmode = INDIO_RING_DATA_RDY) + return len; + + /* fixme not the simplest method out!*/ @@ -1188,7 +1187,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + struct lis3l02dq_datum ring_data; + + rx_array = kmalloc(12, GFP_KERNEL); -+ if (rx_array == NULL) { ++ if (rx_array = NULL) { + dev_err(&st->us->dev, "memory alloc failed in ring bh"); + return; + } @@ -1221,7 +1220,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + /* push data into ring buffer before trying renable */ + enable_irq(st->us->irq); + if (gpio_get_value(irq_to_gpio(st->us->irq))) -+ if (st->inter == 0) { ++ if (st->inter = 0) { + disable_irq_nosync(st->us->irq); + goto try_again; + } @@ -1452,7 +1451,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + /* must init this somewhere */ + INIT_LIST_HEAD(&iio_event_sw_ring_enable.list); + st = kzalloc(sizeof(struct lis3l02dq_state), GFP_KERNEL); -+ if (st == NULL) { ++ if (st = NULL) { + ret = -ENOMEM; + goto error_ret; + } @@ -1461,7 +1460,7 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ + st->us = spi; + /* setup the industrialio driver allocated elements */ + st->indio_dev = kzalloc(sizeof(struct iio_dev), GFP_KERNEL); -+ if (st->indio_dev == NULL) { ++ if (st->indio_dev = NULL) { + ret = -ENOMEM; + goto error_free_st; + } @@ -1608,3 +1607,10 @@ drivers/industrialio/accelerometer/lis3l02dq.h | 168 +++ +MODULE_AUTHOR("Jonathan Cameron <jic23@cam.ac.uk>"); +MODULE_DESCRIPTION("ST LIS3L02DQ Accelerometer SPI driver"); +MODULE_LICENSE("GPL v2"); + + + +_______________________________________________ +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 5f87902..4e38ddd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0488763AD.4050400@gmail.com\0" "From\0Jonathan Cameron <Jonathan.Cameron@gmail.com>\0" - "Subject\0[Patch 3/4] ST LIS3L02DQ accelerometer\0" - "Date\0Wed, 23 Jul 2008 18:14:28 +0100\0" + "Subject\0[lm-sensors] [Patch 3/4] ST LIS3L02DQ accelerometer\0" + "Date\0Wed, 23 Jul 2008 17:14:28 +0000\0" "To\0LKML <linux-kernel@vger.kernel.org>" spi-devel-general@lists.sourceforge.net " LM Sensors <lm-sensors@lm-sensors.org>\0" @@ -311,8 +311,7 @@ "+};\n" "+\n" "+/* Read all inputs in one spi message */\n" - "+static const char read_all_tx_array[] =\n" - "+{\n" + "+static const char read_all_tx_array[] +{\n" "+\t0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_L_ADDRESS),\n" "+\t0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_H_ADDRESS),\n" "+\t0, LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_Y_L_ADDRESS),\n" @@ -416,13 +415,13 @@ "+\t};\n" "+\n" "+\txfer.tx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (xfer.tx_buf == NULL) {\n" + "+\tif (xfer.tx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_ret;\n" "+\t}\n" "+\n" "+\txfer.rx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (xfer.rx_buf == NULL) {\n" + "+\tif (xfer.rx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_free_tx;\n" "+\t}\n" @@ -503,7 +502,7 @@ "+\tint ret;\n" "+\n" "+\tlocal_tx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (local_tx_buf == NULL) {\n" + "+\tif (local_tx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_ret;\n" "+\t}\n" @@ -552,7 +551,7 @@ "+\n" "+\ttval.val = value;\n" "+\tlocal_tx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (local_tx_buf == NULL) {\n" + "+\tif (local_tx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_ret;\n" "+\t}\n" @@ -603,12 +602,12 @@ "+\t\t},\n" "+\t};\n" "+\tlocal_tx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (local_tx_buf == NULL) {\n" + "+\tif (local_tx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_ret;\n" "+\t}\n" "+\tlocal_rx_buf = kmalloc(4, GFP_KERNEL);\n" - "+\tif (local_rx_buf == NULL) {\n" + "+\tif (local_rx_buf = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_free_tx_buf;\n" "+\t}\n" @@ -773,7 +772,7 @@ "+\tint element;\n" "+\n" "+\tmutex_lock(&indio_dev->mlock);\n" - "+\tif (indio_dev->currentmode == INDIO_RING_DATA_RDY) {\n" + "+\tif (indio_dev->currentmode = INDIO_RING_DATA_RDY) {\n" "+\t\tswitch (this_attr->address) {\n" "+\t\tcase LIS3L02DQ_REG_OUT_X_L_ADDRESS:\n" "+\t\t\telement = 0;\n" @@ -840,11 +839,11 @@ "+\tif (ret)\n" "+\t\tgoto error_ret;\n" "+\tt &= LIS3L02DQ_DEC_MASK;\n" - "+\tif (t == LIS3L02DQ_REG_CTRL_1_DF_128)\n" + "+\tif (t = LIS3L02DQ_REG_CTRL_1_DF_128)\n" "+\t\tlen = sprintf(buf, \"280\");\n" - "+\telse if (t == LIS3L02DQ_REG_CTRL_1_DF_64)\n" + "+\telse if (t = LIS3L02DQ_REG_CTRL_1_DF_64)\n" "+\t\tlen = sprintf(buf, \"560\");\n" - "+\telse if (t == LIS3L02DQ_REG_CTRL_1_DF_32)\n" + "+\telse if (t = LIS3L02DQ_REG_CTRL_1_DF_32)\n" "+\t\tlen = sprintf(buf, \"1120\");\n" "+\telse\n" "+\t\tlen = sprintf(buf, \"4480\");\n" @@ -1033,7 +1032,7 @@ "+\tint8_t valold, controlold;\n" "+\tbool val;\n" "+\n" - "+\tval = (buf[0] == '0') ? 0 : 1;\n" + "+\tval = (buf[0] = '0') ? 0 : 1;\n" "+\n" "+\tmutex_lock(&indio_dev->mlock);\n" "+\t/* read current value */\n" @@ -1050,13 +1049,13 @@ "+\tif (ret)\n" "+\t\tgoto error_mutex_unlock;\n" "+\tcurrentlyset = valold & this_attr->mask ? 1 : 0;\n" - "+\tif (val == false && currentlyset) {\n" + "+\tif (val = false && currentlyset) {\n" "+\t\tvalold &= ~this_attr->mask;\n" "+\t\tchanged = 1;\n" "+\t\tret = iio_remove_event_from_list(this_attr->listel);\n" "+\t\tif (ret)\n" "+\t\t\tgoto error_mutex_unlock;\n" - "+\t} else if (val == true && !currentlyset) {\n" + "+\t} else if (val = true && !currentlyset) {\n" "+\t\tchanged = 1;\n" "+\t\tvalold |= this_attr->mask;\n" "+\t\t/* move to a line spec rather than this? */\n" @@ -1132,7 +1131,7 @@ "+\t\t= valold & LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION\n" "+\t\t? 1 : 0;\n" "+\t/* if set, disable requested and ring buffer not in use (FIXME) */\n" - "+\tif (state == 0 && currentlyset) {\n" + "+\tif (state = 0 && currentlyset) {\n" "+\t\tvalold &= ~LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION;\n" "+\t\tret = iio_remove_event_from_list(list);\n" "+\t\tif (ret)\n" @@ -1171,7 +1170,7 @@ "+\tstruct iio_event_attr *this_attr = to_iio_event_attr(attr);\n" "+\n" "+\tmutex_lock(&indio_dev->mlock);\n" - "+\tif (indio_dev->currentmode == INDIO_RING_DATA_RDY)\n" + "+\tif (indio_dev->currentmode = INDIO_RING_DATA_RDY)\n" "+\t\treturn len;\n" "+\n" "+\t/* fixme not the simplest method out!*/\n" @@ -1205,7 +1204,7 @@ "+\tstruct lis3l02dq_datum ring_data;\n" "+\n" "+\trx_array = kmalloc(12, GFP_KERNEL);\n" - "+\tif (rx_array == NULL) {\n" + "+\tif (rx_array = NULL) {\n" "+\t\tdev_err(&st->us->dev, \"memory alloc failed in ring bh\");\n" "+\t\treturn;\n" "+\t}\n" @@ -1238,7 +1237,7 @@ "+\t/* push data into ring buffer before trying renable */\n" "+\tenable_irq(st->us->irq);\n" "+\tif (gpio_get_value(irq_to_gpio(st->us->irq)))\n" - "+\t\tif (st->inter == 0) {\n" + "+\t\tif (st->inter = 0) {\n" "+\t\t\tdisable_irq_nosync(st->us->irq);\n" "+\t\t\tgoto try_again;\n" "+\t\t}\n" @@ -1469,7 +1468,7 @@ "+\t/* must init this somewhere */\n" "+\tINIT_LIST_HEAD(&iio_event_sw_ring_enable.list);\n" "+\tst = kzalloc(sizeof(struct lis3l02dq_state), GFP_KERNEL);\n" - "+\tif (st == NULL) {\n" + "+\tif (st = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_ret;\n" "+\t}\n" @@ -1478,7 +1477,7 @@ "+\tst->us = spi;\n" "+\t/* setup the industrialio driver allocated elements */\n" "+\tst->indio_dev = kzalloc(sizeof(struct iio_dev), GFP_KERNEL);\n" - "+\tif (st->indio_dev == NULL) {\n" + "+\tif (st->indio_dev = NULL) {\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error_free_st;\n" "+\t}\n" @@ -1624,6 +1623,13 @@ "+\n" "+MODULE_AUTHOR(\"Jonathan Cameron <jic23@cam.ac.uk>\");\n" "+MODULE_DESCRIPTION(\"ST LIS3L02DQ Accelerometer SPI driver\");\n" - "+MODULE_LICENSE(\"GPL v2\");" + "+MODULE_LICENSE(\"GPL v2\");\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 -afd6705d043f296d0abade4d2f2bc25318e28e207d7fd40268d0e523ae89e8ea +b7c20fa2aa6d88b7a8ea3ce920433bc74dad9030c1b3899b8716f9e2cbad1657
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.