From af26bebea1199d8cbefd39b42ade40698504afba Mon Sep 17 00:00:00 2001 From: Marek Behún Date: Sun, 20 Sep 2020 02:24:55 +0200 Subject: leds: pca963x: use devres LED registering function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By using devres version of LED registering function we can remove the .remove method from this driver. The probe method also gets simpler. Signed-off-by: Marek Behún Cc: Peter Meerwald Cc: Ricardo Ribalda Cc: Zahari Petkov Signed-off-by: Pavel Machek --- drivers/leds/leds-pca963x.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'drivers/leds/leds-pca963x.c') diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index c03871f92fec..cbb3bf6c044f 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -432,9 +432,9 @@ static int pca963x_probe(struct i2c_client *client, if (pdata && pdata->blink_type == PCA963X_HW_BLINK) pca963x[i].led_cdev.blink_set = pca963x_blink_set; - err = led_classdev_register(dev, &pca963x[i].led_cdev); + err = devm_led_classdev_register(dev, &pca963x[i].led_cdev); if (err < 0) - goto exit; + return err; } /* Disable LED all-call address, and power down initially */ @@ -454,23 +454,6 @@ static int pca963x_probe(struct i2c_client *client, } return 0; - -exit: - while (i--) - led_classdev_unregister(&pca963x[i].led_cdev); - - return err; -} - -static int pca963x_remove(struct i2c_client *client) -{ - struct pca963x *pca963x = i2c_get_clientdata(client); - int i; - - for (i = 0; i < pca963x->chipdef->n_leds; i++) - led_classdev_unregister(&pca963x->leds[i].led_cdev); - - return 0; } static struct i2c_driver pca963x_driver = { @@ -479,7 +462,6 @@ static struct i2c_driver pca963x_driver = { .of_match_table = of_pca963x_match, }, .probe = pca963x_probe, - .remove = pca963x_remove, .id_table = pca963x_id, }; -- cgit v1.2.3-59-g8ed1b