tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

leds: lp55xx: Convert LED class registration to devm_*

Convert the LED class registration calls to the LED devm_*
registration calls.

Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

authored by

Dan Murphy and committed by
Pavel Machek c732eaf0 a89d385d

+13 -40
+3 -6
drivers/leds/leds-lp5521.c
··· 541 541 542 542 ret = lp55xx_register_leds(led, chip); 543 543 if (ret) 544 - goto err_register_leds; 544 + goto err_out; 545 545 546 546 ret = lp55xx_register_sysfs(chip); 547 547 if (ret) { 548 548 dev_err(&client->dev, "registering sysfs failed\n"); 549 - goto err_register_sysfs; 549 + goto err_out; 550 550 } 551 551 552 552 return 0; 553 553 554 - err_register_sysfs: 555 - lp55xx_unregister_leds(led, chip); 556 - err_register_leds: 554 + err_out: 557 555 lp55xx_deinit_device(chip); 558 556 err_init: 559 557 return ret; ··· 564 566 565 567 lp5521_stop_all_engines(chip); 566 568 lp55xx_unregister_sysfs(chip); 567 - lp55xx_unregister_leds(led, chip); 568 569 lp55xx_deinit_device(chip); 569 570 570 571 return 0;
+3 -6
drivers/leds/leds-lp5523.c
··· 909 909 910 910 ret = lp55xx_register_leds(led, chip); 911 911 if (ret) 912 - goto err_register_leds; 912 + goto err_out; 913 913 914 914 ret = lp55xx_register_sysfs(chip); 915 915 if (ret) { 916 916 dev_err(&client->dev, "registering sysfs failed\n"); 917 - goto err_register_sysfs; 917 + goto err_out; 918 918 } 919 919 920 920 return 0; 921 921 922 - err_register_sysfs: 923 - lp55xx_unregister_leds(led, chip); 924 - err_register_leds: 922 + err_out: 925 923 lp55xx_deinit_device(chip); 926 924 err_init: 927 925 return ret; ··· 932 934 933 935 lp5523_stop_all_engines(chip); 934 936 lp55xx_unregister_sysfs(chip); 935 - lp55xx_unregister_leds(led, chip); 936 937 lp55xx_deinit_device(chip); 937 938 938 939 return 0;
+3 -6
drivers/leds/leds-lp5562.c
··· 554 554 555 555 ret = lp55xx_register_leds(led, chip); 556 556 if (ret) 557 - goto err_register_leds; 557 + goto err_out; 558 558 559 559 ret = lp55xx_register_sysfs(chip); 560 560 if (ret) { 561 561 dev_err(&client->dev, "registering sysfs failed\n"); 562 - goto err_register_sysfs; 562 + goto err_out; 563 563 } 564 564 565 565 return 0; 566 566 567 - err_register_sysfs: 568 - lp55xx_unregister_leds(led, chip); 569 - err_register_leds: 567 + err_out: 570 568 lp55xx_deinit_device(chip); 571 569 err_init: 572 570 return ret; ··· 578 580 lp5562_stop_engine(chip); 579 581 580 582 lp55xx_unregister_sysfs(chip); 581 - lp55xx_unregister_leds(led, chip); 582 583 lp55xx_deinit_device(chip); 583 584 584 585 return 0;
+1 -14
drivers/leds/leds-lp55xx-common.c
··· 179 179 led->cdev.name = name; 180 180 } 181 181 182 - ret = led_classdev_register(dev, &led->cdev); 182 + ret = devm_led_classdev_register(dev, &led->cdev); 183 183 if (ret) { 184 184 dev_err(dev, "led register err: %d\n", ret); 185 185 return ret; ··· 480 480 return 0; 481 481 482 482 err_init_led: 483 - lp55xx_unregister_leds(led, chip); 484 483 return ret; 485 484 } 486 485 EXPORT_SYMBOL_GPL(lp55xx_register_leds); 487 - 488 - void lp55xx_unregister_leds(struct lp55xx_led *led, struct lp55xx_chip *chip) 489 - { 490 - int i; 491 - struct lp55xx_led *each; 492 - 493 - for (i = 0; i < chip->num_leds; i++) { 494 - each = led + i; 495 - led_classdev_unregister(&each->cdev); 496 - } 497 - } 498 - EXPORT_SYMBOL_GPL(lp55xx_unregister_leds); 499 486 500 487 int lp55xx_register_sysfs(struct lp55xx_chip *chip) 501 488 {
-2
drivers/leds/leds-lp55xx-common.h
··· 189 189 /* common LED class device functions */ 190 190 extern int lp55xx_register_leds(struct lp55xx_led *led, 191 191 struct lp55xx_chip *chip); 192 - extern void lp55xx_unregister_leds(struct lp55xx_led *led, 193 - struct lp55xx_chip *chip); 194 192 195 193 /* common device attributes functions */ 196 194 extern int lp55xx_register_sysfs(struct lp55xx_chip *chip);
+3 -6
drivers/leds/leds-lp8501.c
··· 344 344 345 345 ret = lp55xx_register_leds(led, chip); 346 346 if (ret) 347 - goto err_register_leds; 347 + goto err_out; 348 348 349 349 ret = lp55xx_register_sysfs(chip); 350 350 if (ret) { 351 351 dev_err(&client->dev, "registering sysfs failed\n"); 352 - goto err_register_sysfs; 352 + goto err_out; 353 353 } 354 354 355 355 return 0; 356 356 357 - err_register_sysfs: 358 - lp55xx_unregister_leds(led, chip); 359 - err_register_leds: 357 + err_out: 360 358 lp55xx_deinit_device(chip); 361 359 err_init: 362 360 return ret; ··· 367 369 368 370 lp8501_stop_engine(chip); 369 371 lp55xx_unregister_sysfs(chip); 370 - lp55xx_unregister_leds(led, chip); 371 372 lp55xx_deinit_device(chip); 372 373 373 374 return 0;