libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op

[linux-2.6-block.git] / drivers / leds / leds-wm831x-status.c

diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index 64a22263e7fc50fd5dca571a7ee2f78804b3e8ee..be93b20e792a7aa36dc81a0cb60de7bb8c66654d 100644 (file)
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -239,7 +239,6 @@ static int wm831x_status_probe(struct platform_device *pdev)
                               GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       platform_set_drvdata(pdev, drvdata);
 
        drvdata->wm831x = wm831x;
        drvdata->reg = res->start;
@@ -284,7 +283,7 @@ static int wm831x_status_probe(struct platform_device *pdev)
        drvdata->cdev.blink_set = wm831x_status_blink_set;
        drvdata->cdev.groups = wm831x_status_groups;
 
-       ret = led_classdev_register(wm831x->dev, &drvdata->cdev);
+       ret = devm_led_classdev_register(wm831x->dev, &drvdata->cdev);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to register LED: %d\n", ret);
                return ret;
@@ -293,21 +292,11 @@ static int wm831x_status_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int wm831x_status_remove(struct platform_device *pdev)
-{
-       struct wm831x_status *drvdata = platform_get_drvdata(pdev);
-
-       led_classdev_unregister(&drvdata->cdev);
-
-       return 0;
-}
-
 static struct platform_driver wm831x_status_driver = {
        .driver = {
                   .name = "wm831x-status",
                   },
        .probe = wm831x_status_probe,
-       .remove = wm831x_status_remove,
 };
 
 module_platform_driver(wm831x_status_driver);