[PATCH 2/5] leds: pca955x: use devm_led_classdev_register
Cédric Le Goater
clg at kaod.org
Fri Jun 9 23:12:26 AEST 2017
This lets us remove the loop doing the cleanup in case of failure and
also the remove handler of the i2c_driver.
Signed-off-by: Cédric Le Goater <clg at kaod.org>
---
drivers/leds/leds-pca955x.c | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index a3e61a57d574..13634a0f6238 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -411,10 +411,10 @@ static int pca955x_probe(struct i2c_client *client,
pca955x_led->led_cdev.name = pca955x_led->name;
pca955x_led->led_cdev.brightness_set_blocking = pca955x_led_set;
- err = led_classdev_register(&client->dev,
+ err = devm_led_classdev_register(&client->dev,
&pca955x_led->led_cdev);
- if (err < 0)
- goto exit;
+ if (err)
+ return err;
}
/* Turn off LEDs */
@@ -432,23 +432,6 @@ static int pca955x_probe(struct i2c_client *client,
pca955x_write_psc(client, 1, 0);
return 0;
-
-exit:
- while (i--)
- led_classdev_unregister(&pca955x->leds[i].led_cdev);
-
- return err;
-}
-
-static int pca955x_remove(struct i2c_client *client)
-{
- struct pca955x *pca955x = i2c_get_clientdata(client);
- int i;
-
- for (i = 0; i < pca955x->chipdef->bits; i++)
- led_classdev_unregister(&pca955x->leds[i].led_cdev);
-
- return 0;
}
static struct i2c_driver pca955x_driver = {
@@ -458,7 +441,6 @@ static struct i2c_driver pca955x_driver = {
.of_match_table = of_match_ptr(of_pca955x_match),
},
.probe = pca955x_probe,
- .remove = pca955x_remove,
.id_table = pca955x_id,
};
--
2.7.4
More information about the openbmc
mailing list