drop queue-5.3/iio-light-fix-vcnl4000-devicetree-hooks.patch

It doesn't apply

diff --git a/queue-5.3/iio-light-fix-vcnl4000-devicetree-hooks.patch b/queue-5.3/iio-light-fix-vcnl4000-devicetree-hooks.patch
deleted file mode 100644 (file)
index 3a16e6c..0000000
--- a/queue-5.3/iio-light-fix-vcnl4000-devicetree-hooks.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 613d129f50a170b7c76032eecc87ae1d749751bd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 17 Sep 2019 16:56:36 +0200
-Subject: iio: light: fix vcnl4000 devicetree hooks
-
-From: Marco Felsch <m.felsch@pengutronix.de>
-
-[ Upstream commit 1436a78c63495dd94c8d4f84a76d78d5317d481b ]
-
-Since commit ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
-the of_match_table is supported but the data shouldn't be a string.
-Instead it shall be one of 'enum vcnl4000_device_ids'. Also the matching
-logic for the vcnl4020 was wrong. Since the data retrieve mechanism is
-still based on the i2c_device_id no failures did appeared till now.
-
-Fixes: ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-Reviewed-by: Angus Ainslie (Purism) angus@akkea.ca
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/light/vcnl4000.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
-index 51421ac325177..f522cb863e8c8 100644
---- a/drivers/iio/light/vcnl4000.c
-+++ b/drivers/iio/light/vcnl4000.c
-@@ -398,19 +398,19 @@ static int vcnl4000_probe(struct i2c_client *client,
- static const struct of_device_id vcnl_4000_of_match[] = {
-       {
-               .compatible = "vishay,vcnl4000",
--              .data = "VCNL4000",
-+              .data = (void *)VCNL4000,
-       },
-       {
-               .compatible = "vishay,vcnl4010",
--              .data = "VCNL4010",
-+              .data = (void *)VCNL4010,
-       },
-       {
--              .compatible = "vishay,vcnl4010",
--              .data = "VCNL4020",
-+              .compatible = "vishay,vcnl4020",
-+              .data = (void *)VCNL4010,
-       },
-       {
-               .compatible = "vishay,vcnl4200",
--              .data = "VCNL4200",
-+              .data = (void *)VCNL4200,
-       },
-       {},
- };
--- 
-2.20.1
-

diff --git a/queue-5.3/series b/queue-5.3/series
index 4b58de1bd16f7aad8c1246744877fa6fdc93e1ee..90528e9cb3f96b0e5e52fca4050019b08ad5ddc9 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -81,4 +81,3 @@ ib-core-fix-wrong-iterating-on-ports.patch
 firmware-google-increment-vpd-key_len-properly.patch
 gpio-fix-getting-nonexclusive-gpiods-from-dt.patch
 gpiolib-don-t-clear-flag_is_out-when-emulating-open-.patch
-iio-light-fix-vcnl4000-devicetree-hooks.patch