|
@@ -195,7 +195,6 @@ static int pm860x_led_probe(struct platform_device *pdev)
|
|
|
sprintf(data->name, "led1-blue");
|
|
|
break;
|
|
|
}
|
|
|
- platform_set_drvdata(pdev, data);
|
|
|
data->chip = chip;
|
|
|
data->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion;
|
|
|
data->port = pdev->id;
|
|
@@ -208,7 +207,7 @@ static int pm860x_led_probe(struct platform_device *pdev)
|
|
|
data->cdev.brightness_set_blocking = pm860x_led_set;
|
|
|
mutex_init(&data->lock);
|
|
|
|
|
|
- ret = led_classdev_register(chip->dev, &data->cdev);
|
|
|
+ ret = devm_led_classdev_register(chip->dev, &data->cdev);
|
|
|
if (ret < 0) {
|
|
|
dev_err(&pdev->dev, "Failed to register LED: %d\n", ret);
|
|
|
return ret;
|
|
@@ -217,21 +216,12 @@ static int pm860x_led_probe(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int pm860x_led_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct pm860x_led *data = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- led_classdev_unregister(&data->cdev);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
|
|
|
static struct platform_driver pm860x_led_driver = {
|
|
|
.driver = {
|
|
|
.name = "88pm860x-led",
|
|
|
},
|
|
|
.probe = pm860x_led_probe,
|
|
|
- .remove = pm860x_led_remove,
|
|
|
};
|
|
|
|
|
|
module_platform_driver(pm860x_led_driver);
|