leds: ns2: do not guard OF match pointer with of_match_ptr (8fd8f942) · Commits · 戴 / test

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

Admin message