Pull staging/IIO driver fixes from Greg KH: "Here are a number of small fixes for staging and IIO drivers that resolve reported problems. Full details are in the shortlog. All of these have been in linux-next with no reported issues" * tag 'staging-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (35 commits) arm: dts: rockchip: add reset node for the exist saradc SoCs arm64: dts: rockchip: add reset saradc node for rk3368 SoCs iio: adc: rockchip_saradc: reset saradc controller before programming it iio: accel: kxsd9: Fix raw read return iio: adc: ti_am335x_adc: Increase timeout value waiting for ADC sample iio: adc: ti_am335x_adc: Protect FIFO1 from concurrent access include/linux: fix excess fence.h kernel-doc notation staging: wilc1000: correctly check if associatedsta has not been found staging: wilc1000: NULL dereference on error staging: wilc1000: txq_event: Fix coding error MAINTAINERS: Add file patterns for ion device tree bindings MAINTAINERS: Update maintainer entry for wilc1000 iio: chemical: atlas-ph-sensor: fix typo in val assignment iio: fix sched WARNING "do not call blocking ops when !TASK_RUNNING" staging: comedi: ni_mio_common: fix AO inttrig backwards compatibility staging: comedi: dt2811: fix a precedence bug staging: comedi: adv_pci1760: Do not return EINVAL for CMDF_ROUND_DOWN. staging: comedi: ni_mio_common: fix wrong insn_write handler staging: comedi: comedi_test: fix timer race conditions staging: comedi: daqboard2000: bug fix board type matching code ...
Showing the changes to include/linux (3 of 38 files). Show all
Unified · Split
| @@ -49,8 +49,6 @@ struct fence_cb; · 48 unmodified lines | ||
| 49 | 49 | * @timestamp: Timestamp when the fence was signaled. |
| 50 | 50 | * @status: Optional, only valid if < 0, must be set before calling |
| 51 | 51 | * fence_signal, indicates that the fence has completed with an error. |
| 52 | − * @child_list: list of children fences | |
| 53 | − * @active_list: list of active fences | |
| 54 | 52 | * |
| 55 | 53 | * the flags member must be manipulated and read using the appropriate |
| 56 | 54 | * atomic ops (bit_*), so taking the spinlock will not be needed most |
| @@ -62,7 +62,7 @@ void iio_swt_group_init_type_name(struct iio_sw_trigger *t, · 61 unmodified lines | ||
| 62 | 62 | const char *name, |
| 63 | 63 | struct config_item_type *type) |
| 64 | 64 | { |
| 65 | −#ifdef CONFIG_CONFIGFS_FS | |
| 65 | +#if IS_ENABLED(CONFIG_CONFIGFS_FS) | |
| 66 | 66 | config_group_init_type_name(&t->group, name, type); |
| 67 | 67 | #endif |
| 68 | 68 | } |
| @@ -138,16 +138,16 @@ · 137 unmodified lines | ||
| 138 | 138 | /* |
| 139 | 139 | * time in us for processing a single channel, calculated as follows: |
| 140 | 140 | * |
| 141 | − * num cycles = open delay + (sample delay + conv time) * averaging | |
| 141 | + * max num cycles = open delay + (sample delay + conv time) * averaging | |
| 142 | 142 | * |
| 143 | − * num cycles: 152 + (1 + 13) * 16 = 376 | |
| 143 | + * max num cycles: 262143 + (255 + 13) * 16 = 266431 | |
| 144 | 144 | * |
| 145 | 145 | * clock frequency: 26MHz / 8 = 3.25MHz |
| 146 | 146 | * clock period: 1 / 3.25MHz = 308ns |
| 147 | 147 | * |
| 148 | − * processing time: 376 * 308ns = 116us | |
| 148 | + * max processing time: 266431 * 308ns = 83ms(approx) | |
| 149 | 149 | */ |
| 150 | −#define IDLE_TIMEOUT 116 /* microsec */ | |
| 150 | +#define IDLE_TIMEOUT 83 /* milliseconds */ | |
| 151 | 151 | |
| 152 | 152 | #define TSCADC_CELLS 2 |
| 153 | 153 | |