From 5390c1dcac3b77541b9ba9806c9774c2ad0ccb6c Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 5 Nov 2025 10:06:35 -0500 Subject: [PATCH] Drop iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch Signed-off-by: Sasha Levin --- ...25-use-iio_push_to_buffers_with_ts-t.patch | 66 ------------------- queue-6.17/series | 1 - 2 files changed, 67 deletions(-) delete mode 100644 queue-6.17/iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch diff --git a/queue-6.17/iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch b/queue-6.17/iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch deleted file mode 100644 index cdeca9a765..0000000000 --- a/queue-6.17/iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 72afc12515b357d26a5ce4f0149379ef797e3e37 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 2 Aug 2025 17:44:29 +0100 -Subject: iio: light: isl29125: Use iio_push_to_buffers_with_ts() to allow - source size runtime check - -From: Jonathan Cameron - -[ Upstream commit f0ffec3b4fa7e430f92302ee233c79aeb021fe14 ] - -Also move the structure used as the source to the stack as it is only 16 -bytes and not the target of an DMA or similar. - -Reviewed-by: Matti Vaittinen -Reviewed-by: Andy Shevchenko -Link: https://patch.msgid.link/20250802164436.515988-10-jic23@kernel.org -Signed-off-by: Jonathan Cameron -Signed-off-by: Sasha Levin ---- - drivers/iio/light/isl29125.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c -index 6bc23b164cc55..3acb8a4f1d120 100644 ---- a/drivers/iio/light/isl29125.c -+++ b/drivers/iio/light/isl29125.c -@@ -51,11 +51,6 @@ - struct isl29125_data { - struct i2c_client *client; - u8 conf1; -- /* Ensure timestamp is naturally aligned */ -- struct { -- u16 chans[3]; -- aligned_s64 timestamp; -- } scan; - }; - - #define ISL29125_CHANNEL(_color, _si) { \ -@@ -179,6 +174,11 @@ static irqreturn_t isl29125_trigger_handler(int irq, void *p) - struct iio_dev *indio_dev = pf->indio_dev; - struct isl29125_data *data = iio_priv(indio_dev); - int i, j = 0; -+ /* Ensure timestamp is naturally aligned */ -+ struct { -+ u16 chans[3]; -+ aligned_s64 timestamp; -+ } scan = { }; - - iio_for_each_active_channel(indio_dev, i) { - int ret = i2c_smbus_read_word_data(data->client, -@@ -186,10 +186,10 @@ static irqreturn_t isl29125_trigger_handler(int irq, void *p) - if (ret < 0) - goto done; - -- data->scan.chans[j++] = ret; -+ scan.chans[j++] = ret; - } - -- iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, -+ iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan), - iio_get_time_ns(indio_dev)); - - done: --- -2.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index 6d33306791..0b3769eb89 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -317,7 +317,6 @@ drm-amdgpu-refactor-bad_page_work-for-corner-case-ha.patch hwrng-timeriomem-use-us_to_ktime-where-appropriate.patch iio-adc-spear_adc-mask-spear_adc_status-channel-and-.patch iio-adc-imx93_adc-load-calibrated-values-even-calibr.patch -iio-light-isl29125-use-iio_push_to_buffers_with_ts-t.patch usb-gadget-f_ncm-fix-mac-assignment-ncm-ethernet.patch asoc-es8323-remove-dac-enablement-write-from-es8323_.patch asoc-es8323-add-proper-left-right-mixer-controls-via.patch -- 2.47.3