aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-07 14:42:47 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-11 04:15:03 -0400
commit5656098e198e793f7b43a11c301b5025c6e51c9a (patch)
treed94203bb1ba9f0e49026f138bb99221365f51cb3 /drivers/regulator
parentc04a9cb813f124abcfad50f93b101ceaee8f3b9f (diff)
mfd: wm831x: Convert to IORESOURCE_REG
This was originally written by Russell King who unfortunately found himself unable to take the patch futher. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Tested-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/wm831x-dcdc.c12
-rw-r--r--drivers/regulator/wm831x-isink.c4
-rw-r--r--drivers/regulator/wm831x-ldo.c12
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 7413885be01b..64111f4935a4 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -476,9 +476,9 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
476 476
477 dcdc->wm831x = wm831x; 477 dcdc->wm831x = wm831x;
478 478
479 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 479 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
480 if (res == NULL) { 480 if (res == NULL) {
481 dev_err(&pdev->dev, "No I/O resource\n"); 481 dev_err(&pdev->dev, "No REG resource\n");
482 ret = -EINVAL; 482 ret = -EINVAL;
483 goto err; 483 goto err;
484 } 484 }
@@ -651,9 +651,9 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
651 651
652 dcdc->wm831x = wm831x; 652 dcdc->wm831x = wm831x;
653 653
654 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 654 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
655 if (res == NULL) { 655 if (res == NULL) {
656 dev_err(&pdev->dev, "No I/O resource\n"); 656 dev_err(&pdev->dev, "No REG resource\n");
657 ret = -EINVAL; 657 ret = -EINVAL;
658 goto err; 658 goto err;
659 } 659 }
@@ -795,9 +795,9 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
795 795
796 dcdc->wm831x = wm831x; 796 dcdc->wm831x = wm831x;
797 797
798 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 798 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
799 if (res == NULL) { 799 if (res == NULL) {
800 dev_err(&pdev->dev, "No I/O resource\n"); 800 dev_err(&pdev->dev, "No REG resource\n");
801 ret = -EINVAL; 801 ret = -EINVAL;
802 goto err; 802 goto err;
803 } 803 }
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 0d207c297714..2646a1902b33 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -172,9 +172,9 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
172 172
173 isink->wm831x = wm831x; 173 isink->wm831x = wm831x;
174 174
175 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 175 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
176 if (res == NULL) { 176 if (res == NULL) {
177 dev_err(&pdev->dev, "No I/O resource\n"); 177 dev_err(&pdev->dev, "No REG resource\n");
178 ret = -EINVAL; 178 ret = -EINVAL;
179 goto err; 179 goto err;
180 } 180 }
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 5cb70ca1e98d..da73daf2eb7c 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -269,9 +269,9 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
269 269
270 ldo->wm831x = wm831x; 270 ldo->wm831x = wm831x;
271 271
272 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 272 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
273 if (res == NULL) { 273 if (res == NULL) {
274 dev_err(&pdev->dev, "No I/O resource\n"); 274 dev_err(&pdev->dev, "No REG resource\n");
275 ret = -EINVAL; 275 ret = -EINVAL;
276 goto err; 276 goto err;
277 } 277 }
@@ -520,9 +520,9 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
520 520
521 ldo->wm831x = wm831x; 521 ldo->wm831x = wm831x;
522 522
523 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 523 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
524 if (res == NULL) { 524 if (res == NULL) {
525 dev_err(&pdev->dev, "No I/O resource\n"); 525 dev_err(&pdev->dev, "No REG resource\n");
526 ret = -EINVAL; 526 ret = -EINVAL;
527 goto err; 527 goto err;
528 } 528 }
@@ -675,9 +675,9 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
675 675
676 ldo->wm831x = wm831x; 676 ldo->wm831x = wm831x;
677 677
678 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 678 res = platform_get_resource(pdev, IORESOURCE_REG, 0);
679 if (res == NULL) { 679 if (res == NULL) {
680 dev_err(&pdev->dev, "No I/O resource\n"); 680 dev_err(&pdev->dev, "No REG resource\n");
681 ret = -EINVAL; 681 ret = -EINVAL;
682 goto err; 682 goto err;
683 } 683 }