Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 18 insertions, 7 deletions

diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 0339b88..4eb373d 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -194,8 +194,7 @@ static int wm831x_isink_probe(struct platform_device *pdev)
 	config.init_data = pdata->isink[id];
 	config.driver_data = isink;
 
-	isink->regulator = devm_regulator_register(&pdev->dev, &isink->desc,
-						   &config);
+	isink->regulator = regulator_register(&isink->desc, &config);
 	if (IS_ERR(isink->regulator)) {
 		ret = PTR_ERR(isink->regulator);
 		dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",
@@ -204,26 +203,38 @@ static int wm831x_isink_probe(struct platform_device *pdev)
 	}
 
 	irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
-	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
-					wm831x_isink_irq,
-					IRQF_TRIGGER_RISING, isink->name,
-					isink);
+	ret = request_threaded_irq(irq, NULL, wm831x_isink_irq,
+				   IRQF_TRIGGER_RISING, isink->name, isink);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n",
 			irq, ret);
-		goto err;
+		goto err_regulator;
 	}
 
 	platform_set_drvdata(pdev, isink);
 
 	return 0;
 
+err_regulator:
+	regulator_unregister(isink->regulator);
 err:
 	return ret;
 }
 
+static int wm831x_isink_remove(struct platform_device *pdev)
+{
+	struct wm831x_isink *isink = platform_get_drvdata(pdev);
+
+	free_irq(wm831x_irq(isink->wm831x, platform_get_irq(pdev, 0)), isink);
+
+	regulator_unregister(isink->regulator);
+
+	return 0;
+}
+
 static struct platform_driver wm831x_isink_driver = {
 	.probe = wm831x_isink_probe,
+	.remove = wm831x_isink_remove,
 	.driver		= {
 		.name	= "wm831x-isink",
 		.owner	= THIS_MODULE,