leds: ns2: do not guard OF match pointer with of_match_ptr
authorMarek Behún <kabel@kernel.org>
Sat, 26 Sep 2020 20:11:31 +0000 (22:11 +0200)
committerPavel Machek <pavel@ucw.cz>
Wed, 30 Sep 2020 17:22:58 +0000 (19:22 +0200)
Do not match OF match pointer with of_match_ptr, so that even if
CONFIG_OF is disabled, the driver can still be bound via another method.

Move definition of of_ns2_leds_match just before ns2_led_driver
definition, since it is not needed sooner.

Signed-off-by: Marek Behún <kabel@kernel.org>
Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
drivers/leds/leds-ns2.c

index dba6bdfa861bef3e3f9255f7a5c46aa1c7cefbfb..1677d66d8b0e349b79e5d8c4fbaaee855f62a3a1 100644 (file)
@@ -235,12 +235,6 @@ static int ns2_led_register(struct device *dev, struct fwnode_handle *node,
        return ret;
 }
 
-static const struct of_device_id of_ns2_leds_match[] = {
-       { .compatible = "lacie,ns2-leds", },
-       {},
-};
-MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
-
 static int ns2_led_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -268,11 +262,17 @@ static int ns2_led_probe(struct platform_device *pdev)
        return 0;
 }
 
+static const struct of_device_id of_ns2_leds_match[] = {
+       { .compatible = "lacie,ns2-leds", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
+
 static struct platform_driver ns2_led_driver = {
        .probe          = ns2_led_probe,
        .driver         = {
                .name           = "leds-ns2",
-               .of_match_table = of_match_ptr(of_ns2_leds_match),
+               .of_match_table = of_ns2_leds_match,
        },
 };