Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb66d565 authored Feb 23, 2010 by Dmitry Torokhov Committed by Liam Girdwood Mar 03, 2010

Regulators: wm831x-xxx - clean up driver data after removal



It is a good tone to reset driver data after unbinding the device.
Also set up drivers owner.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

parent 6a74857d

drivers/regulator/wm831x-dcdc.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,8 @@ static __devexit int wm831x_buckv_remove(struct platform_device *pdev)
		struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
		struct wm831x *wm831x = dcdc->wm831x;

		platform_set_drvdata(pdev, NULL);

		wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "HC"), dcdc);
		wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), dcdc);
		regulator_unregister(dcdc->regulator);
		@@ -615,6 +617,7 @@ static struct platform_driver wm831x_buckv_driver = {
		.remove = __devexit_p(wm831x_buckv_remove),
		.driver = {
		.name = "wm831x-buckv",
		.owner = THIS_MODULE,
		},
		};

		@@ -769,6 +772,8 @@ static __devexit int wm831x_buckp_remove(struct platform_device *pdev)
		struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
		struct wm831x *wm831x = dcdc->wm831x;

		platform_set_drvdata(pdev, NULL);

		wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), dcdc);
		regulator_unregister(dcdc->regulator);
		kfree(dcdc);
		@@ -781,6 +786,7 @@ static struct platform_driver wm831x_buckp_driver = {
		.remove = __devexit_p(wm831x_buckp_remove),
		.driver = {
		.name = "wm831x-buckp",
		.owner = THIS_MODULE,
		},
		};

		@@ -895,6 +901,8 @@ static __devexit int wm831x_boostp_remove(struct platform_device *pdev)
		struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
		struct wm831x *wm831x = dcdc->wm831x;

		platform_set_drvdata(pdev, NULL);

		wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), dcdc);
		regulator_unregister(dcdc->regulator);
		kfree(dcdc);
		@@ -907,6 +915,7 @@ static struct platform_driver wm831x_boostp_driver = {
		.remove = __devexit_p(wm831x_boostp_remove),
		.driver = {
		.name = "wm831x-boostp",
		.owner = THIS_MODULE,
		},
		};

		@@ -979,6 +988,8 @@ static __devexit int wm831x_epe_remove(struct platform_device *pdev)
		{
		struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);

		platform_set_drvdata(pdev, NULL);

		regulator_unregister(dcdc->regulator);
		kfree(dcdc);

		@@ -990,6 +1001,7 @@ static struct platform_driver wm831x_epe_driver = {
		.remove = __devexit_p(wm831x_epe_remove),
		.driver = {
		.name = "wm831x-epe",
		.owner = THIS_MODULE,
		},
		};

drivers/regulator/wm831x-isink.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,8 @@ static __devexit int wm831x_isink_remove(struct platform_device *pdev)
		struct wm831x_isink *isink = platform_get_drvdata(pdev);
		struct wm831x *wm831x = isink->wm831x;

		platform_set_drvdata(pdev, NULL);

		wm831x_free_irq(wm831x, platform_get_irq(pdev, 0), isink);

		regulator_unregister(isink->regulator);
		@@ -235,6 +237,7 @@ static struct platform_driver wm831x_isink_driver = {
		.remove = __devexit_p(wm831x_isink_remove),
		.driver = {
		.name = "wm831x-isink",
		.owner = THIS_MODULE,
		},
		};

drivers/regulator/wm831x-ldo.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,8 @@ static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)
		struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
		struct wm831x *wm831x = ldo->wm831x;

		platform_set_drvdata(pdev, NULL);

		wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), ldo);
		regulator_unregister(ldo->regulator);
		kfree(ldo);
		@@ -383,6 +385,7 @@ static struct platform_driver wm831x_gp_ldo_driver = {
		.remove = __devexit_p(wm831x_gp_ldo_remove),
		.driver = {
		.name = "wm831x-ldo",
		.owner = THIS_MODULE,
		},
		};

		@@ -640,6 +643,7 @@ static struct platform_driver wm831x_aldo_driver = {
		.remove = __devexit_p(wm831x_aldo_remove),
		.driver = {
		.name = "wm831x-aldo",
		.owner = THIS_MODULE,
		},
		};

		@@ -811,6 +815,7 @@ static struct platform_driver wm831x_alive_ldo_driver = {
		.remove = __devexit_p(wm831x_alive_ldo_remove),
		.driver = {
		.name = "wm831x-alive-ldo",
		.owner = THIS_MODULE,
		},
		};