Merge tag 'rproc-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-2.6-microblaze.git] / drivers / leds / leds-sc27xx-bltc.c

diff --git a/drivers/leds/leds-sc27xx-bltc.c b/drivers/leds/leds-sc27xx-bltc.c
index e199ea1..f04db79 100644 (file)
--- a/drivers/leds/leds-sc27xx-bltc.c
+++ b/drivers/leds/leds-sc27xx-bltc.c
@@ -296,7 +296,6 @@ static int sc27xx_led_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        platform_set_drvdata(pdev, priv);
-       mutex_init(&priv->lock);
        priv->base = base;
        priv->regmap = dev_get_regmap(dev->parent, NULL);
        if (!priv->regmap) {
@@ -309,13 +308,11 @@ static int sc27xx_led_probe(struct platform_device *pdev)
                err = of_property_read_u32(child, "reg", &reg);
                if (err) {
                        of_node_put(child);
-                       mutex_destroy(&priv->lock);
                        return err;
                }
 
                if (reg >= SC27XX_LEDS_MAX || priv->leds[reg].active) {
                        of_node_put(child);
-                       mutex_destroy(&priv->lock);
                        return -EINVAL;
                }
 
@@ -323,6 +320,8 @@ static int sc27xx_led_probe(struct platform_device *pdev)
                priv->leds[reg].active = true;
        }
 
+       mutex_init(&priv->lock);
+
        err = sc27xx_led_register(dev, priv);
        if (err)
                mutex_destroy(&priv->lock);
@@ -330,12 +329,11 @@ static int sc27xx_led_probe(struct platform_device *pdev)
        return err;
 }
 
-static int sc27xx_led_remove(struct platform_device *pdev)
+static void sc27xx_led_remove(struct platform_device *pdev)
 {
        struct sc27xx_led_priv *priv = platform_get_drvdata(pdev);
 
        mutex_destroy(&priv->lock);
-       return 0;
 }
 
 static const struct of_device_id sc27xx_led_of_match[] = {
@@ -350,7 +348,7 @@ static struct platform_driver sc27xx_led_driver = {
                .of_match_table = sc27xx_led_of_match,
        },
        .probe = sc27xx_led_probe,
-       .remove = sc27xx_led_remove,
+       .remove_new = sc27xx_led_remove,
 };
 
 module_platform_driver(sc27xx_led_driver);