Merge tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / leds / flash / leds-mt6360.c

diff --git a/drivers/leds/flash/leds-mt6360.c b/drivers/leds/flash/leds-mt6360.c
index 1af6c58..a90de82 100644 (file)
--- a/drivers/leds/flash/leds-mt6360.c
+++ b/drivers/leds/flash/leds-mt6360.c
@@ -91,7 +91,7 @@ struct mt6360_priv {
        unsigned int fled_torch_used;
        unsigned int leds_active;
        unsigned int leds_count;
-       struct mt6360_led leds[];
+       struct mt6360_led leds[] __counted_by(leds_count);
 };
 
 static int mt6360_mc_brightness_set(struct led_classdev *lcdev,
@@ -855,12 +855,11 @@ out_flash_release:
        return ret;
 }
 
-static int mt6360_led_remove(struct platform_device *pdev)
+static void mt6360_led_remove(struct platform_device *pdev)
 {
        struct mt6360_priv *priv = platform_get_drvdata(pdev);
 
        mt6360_v4l2_flash_release(priv);
-       return 0;
 }
 
 static const struct of_device_id __maybe_unused mt6360_led_of_id[] = {
@@ -875,7 +874,7 @@ static struct platform_driver mt6360_led_driver = {
                .of_match_table = mt6360_led_of_id,
        },
        .probe = mt6360_led_probe,
-       .remove = mt6360_led_remove,
+       .remove_new = mt6360_led_remove,
 };
 module_platform_driver(mt6360_led_driver);