Pull char/misc fixes from Greg KH: "Some small driver fixes for 6.1-rc3. They include: - iio driver bugfixes - counter driver bugfixes - coresight bugfixes, including a revert and then a second fix to get it right. All of these have been in linux-next with no reported problems" * tag 'char-misc-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (21 commits) misc: sgi-gru: use explicitly signed char coresight: cti: Fix hang in cti_disable_hw() Revert "coresight: cti: Fix hang in cti_disable_hw()" counter: 104-quad-8: Fix race getting function mode and direction counter: microchip-tcb-capture: Handle Signal1 read and Synapse coresight: cti: Fix hang in cti_disable_hw() coresight: Fix possible deadlock with lock dependency counter: ti-ecap-capture: fix IS_ERR() vs NULL check counter: Reduce DEFINE_COUNTER_ARRAY_POLARITY() to defining counter_array iio: bmc150-accel-core: Fix unsafe buffer attributes iio: adxl367: Fix unsafe buffer attributes iio: adxl372: Fix unsafe buffer attributes iio: at91-sama5d2_adc: Fix unsafe buffer attributes iio: temperature: ltc2983: allocate iio channels once tools: iio: iio_utils: fix digit calculation iio: adc: stm32-adc: fix channel sampling time init iio: adc: mcp3911: mask out device ID in debug prints iio: adc: mcp3911: use correct id bits iio: adc: mcp3911: return proper error code on failure to allocate trigger iio: adc: mcp3911: fix sizeof() vs ARRAY_SIZE() bug ...
Showing the changes to include/linux (1 of 17 files). Show all
Unified · Split
| @@ -542,11 +542,10 @@ struct counter_array { · 541 unmodified lines | ||
| 542 | 542 | #define DEFINE_COUNTER_ARRAY_CAPTURE(_name, _length) \ |
| 543 | 543 | DEFINE_COUNTER_ARRAY_U64(_name, _length) |
| 544 | 544 | |
| 545 | −#define DEFINE_COUNTER_ARRAY_POLARITY(_name, _enums, _length) \ | |
| 546 | − DEFINE_COUNTER_AVAILABLE(_name##_available, _enums); \ | |
| 545 | +#define DEFINE_COUNTER_ARRAY_POLARITY(_name, _available, _length) \ | |
| 547 | 546 | struct counter_array _name = { \ |
| 548 | 547 | .type = COUNTER_COMP_SIGNAL_POLARITY, \ |
| 549 | − .avail = &(_name##_available), \ | |
| 548 | + .avail = &(_available), \ | |
| 550 | 549 | .length = (_length), \ |
| 551 | 550 | } |
| 552 | 551 | |