FAILED: patch "[PATCH] iio: light: fix vcnl4000 devicetree hooks" failed to apply to 5.3-stable tree

PATCH [email protected] 2 participants 9 messages Oct 14, 2019 – Oct 16, 2019

Subsystems (2)

Stable branch IIO

lore

Share & tools

lore

[email protected]

author maintainer

2019-10-14 16:11 UTC #0 lore raw

The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks

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 <[email protected]>

Reviewed-by Angus Ainslie (Purism) [email protected]

Cc <[email protected]>

Signed-off-by Jonathan Cameron <[email protected]>

drivers/iio/light/vcnl4000.c +5 -5

index 51421ac32517..f522cb863e8c 100644
@@ -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,
 	},
 	{},
 };

Sasha Levin

maintainer

2019-10-15 03:04 UTC #1 lore raw

Quoted 23 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:

The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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.

Quoted 5 lines

Fixes ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
Signed-off-by Marco Felsch <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

Greg, I'm not sure why you dropped this one?

I've queued it up for 5.3.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2019-10-15 06:18 UTC #2 lore raw

Quoted 30 lines · Sasha Levin

Quoted 23 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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.
Quoted 5 lines
Fixes ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
Signed-off-by Marco Felsch <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

Quoted 3 lines

Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.

It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(

So I'm going to drop it now. How did this apply on your side?

thanks,

greg k-h

Sasha Levin

maintainer

2019-10-15 14:19 UTC #3 lore raw

Quoted 31 lines · Greg KH

Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

Quoted 8 lines

Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?

I... uh... it just applies?

$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)

what do you see as the conflict? line numbers look mostly the same, so as the context.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2019-10-15 15:33 UTC #4 lore raw

Quoted 43 lines · Sasha Levin

Quoted 31 lines · Greg KH
Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
I... uh... it just applies?

Quoted 8 lines

$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)

what do you see as the conflict? line numbers look mostly the same, so as the context.

It's conflicting with another patch already in the queue, try applying it now and see what happens :)

greg k-h

Sasha Levin

maintainer

2019-10-15 16:37 UTC #5 lore raw

Quoted 50 lines · Greg KH

Quoted 49 lines · Sasha Levin
Quoted 31 lines · Greg KH
Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
I... uh... it just applies?
$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)

Quoted 5 lines

Quoted 2 lines
what do you see as the conflict? line numbers look mostly the same, so as the context.
It's conflicting with another patch already in the queue, try applying it now and see what happens :)

Apparently git resolves this conflict correctly. After cherry-pick, that commit looks like this:

drivers/iio/light/vcnl4000.c +0 -0

index ca0d27b46ea22..16dacea9eadfa 100644
@@ -398,15 +398,15 @@ 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,vcnl4040",
@@ -414,7 +414,7 @@ static const struct of_device_id vcnl_4000_of_match[] = {
       },
       {
               .compatible = "vishay,vcnl4200",
-               .data = "VCNL4200",
+               .data = (void *)VCNL4200,
       },
       {},
};

Unless you have any objections, I'll queue up this version instead.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2019-10-15 17:40 UTC #6 lore raw

Quoted 94 lines · Sasha Levin

Quoted 50 lines · Greg KH
Quoted 49 lines · Sasha Levin
Quoted 31 lines · Greg KH
Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
I... uh... it just applies?
$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 5 lines
Quoted 2 lines
what do you see as the conflict? line numbers look mostly the same, so as the context.
It's conflicting with another patch already in the queue, try applying it now and see what happens :)
Apparently git resolves this conflict correctly. After cherry-pick, that commit looks like this:
drivers/iio/light/vcnl4000.c +5 -5
index ca0d27b46ea22..16dacea9eadfa 100644
@@ -398,15 +398,15 @@ 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,vcnl4040",
@@ -414,7 +414,7 @@ static const struct of_device_id vcnl_4000_of_match[] = {
       },
       {
               .compatible = "vishay,vcnl4200",
-               .data = "VCNL4200",
+               .data = (void *)VCNL4200,
       },
       {},
 };

Quoted 1 line

Unless you have any objections, I'll queue up this version instead.

No objection, please do! I'm on a plane for the next 8+ hours and have limited git access...

greg k-h

Sasha Levin

maintainer

2019-10-15 22:06 UTC #7 lore raw

Quoted 95 lines · Greg KH

Quoted 94 lines · Sasha Levin
Quoted 50 lines · Greg KH
Quoted 49 lines · Sasha Levin
Quoted 31 lines · Greg KH
Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
I... uh... it just applies?
$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 5 lines
Quoted 2 lines
what do you see as the conflict? line numbers look mostly the same, so as the context.
It's conflicting with another patch already in the queue, try applying it now and see what happens :)
Apparently git resolves this conflict correctly. After cherry-pick, that commit looks like this:
drivers/iio/light/vcnl4000.c +5 -5
index ca0d27b46ea22..16dacea9eadfa 100644
@@ -398,15 +398,15 @@ 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,vcnl4040",
@@ -414,7 +414,7 @@ static const struct of_device_id vcnl_4000_of_match[] = {
       },
       {
               .compatible = "vishay,vcnl4200",
-               .data = "VCNL4200",
+               .data = (void *)VCNL4200,
       },
       {},
 };

Quoted 4 lines

Quoted 1 line
Unless you have any objections, I'll queue up this version instead.
No objection, please do! I'm on a plane for the next 8+ hours and have limited git access...

It's back in the queue, and I've verified that applying the patch file with 'patch -p1 [...]' works.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2019-10-16 12:53 UTC #8 lore raw

Quoted 96 lines · Sasha Levin

Quoted 95 lines · Greg KH
Quoted 94 lines · Sasha Levin
Quoted 50 lines · Greg KH
Quoted 49 lines · Sasha Levin
Quoted 31 lines · Greg KH
Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Oct 14, 2019 at 06:11:42PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
From: Marco Felsch <[email protected]>
Date: Tue, 17 Sep 2019 16:56:36 +0200
Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
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 <[email protected]>
Reviewed-by Angus Ainslie (Purism) [email protected]
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
Quoted 3 lines
Greg, I'm not sure why you dropped this one?
I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
I... uh... it just applies?
$ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
[queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
Author: Marco Felsch <[email protected]>
Date: Tue Sep 17 16:56:36 2019 +0200
1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 5 lines
Quoted 2 lines
what do you see as the conflict? line numbers look mostly the same, so as the context.
It's conflicting with another patch already in the queue, try applying it now and see what happens :)
Apparently git resolves this conflict correctly. After cherry-pick, that commit looks like this:
drivers/iio/light/vcnl4000.c +5 -5
index ca0d27b46ea22..16dacea9eadfa 100644
@@ -398,15 +398,15 @@ 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,vcnl4040",
@@ -414,7 +414,7 @@ static const struct of_device_id vcnl_4000_of_match[] = {
       },
       {
               .compatible = "vishay,vcnl4200",
-               .data = "VCNL4200",
+               .data = (void *)VCNL4200,
       },
       {},
 };

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
Unless you have any objections, I'll queue up this version instead.
No objection, please do! I'm on a plane for the next 8+ hours and have limited git access...
It's back in the queue, and I've verified that applying the patch file with 'patch -p1 [...]' works.

Thanks for fixing that up and adding it to the queue.

greg k-h