aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/smartreflex.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index f6b8f455685b..008fbd7b9352 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -421,7 +421,7 @@ int sr_configure_errgen(struct voltagedomain *voltdm)
421 if (IS_ERR(sr)) { 421 if (IS_ERR(sr)) {
422 pr_warning("%s: omap_sr struct for sr_%s not found\n", 422 pr_warning("%s: omap_sr struct for sr_%s not found\n",
423 __func__, voltdm->name); 423 __func__, voltdm->name);
424 return -EINVAL; 424 return PTR_ERR(sr);
425 } 425 }
426 426
427 if (!sr->clk_length) 427 if (!sr->clk_length)
@@ -489,7 +489,7 @@ int sr_disable_errgen(struct voltagedomain *voltdm)
489 if (IS_ERR(sr)) { 489 if (IS_ERR(sr)) {
490 pr_warning("%s: omap_sr struct for sr_%s not found\n", 490 pr_warning("%s: omap_sr struct for sr_%s not found\n",
491 __func__, voltdm->name); 491 __func__, voltdm->name);
492 return -EINVAL; 492 return PTR_ERR(sr);
493 } 493 }
494 494
495 switch (sr->ip_type) { 495 switch (sr->ip_type) {
@@ -540,7 +540,7 @@ int sr_configure_minmax(struct voltagedomain *voltdm)
540 if (IS_ERR(sr)) { 540 if (IS_ERR(sr)) {
541 pr_warning("%s: omap_sr struct for sr_%s not found\n", 541 pr_warning("%s: omap_sr struct for sr_%s not found\n",
542 __func__, voltdm->name); 542 __func__, voltdm->name);
543 return -EINVAL; 543 return PTR_ERR(sr);
544 } 544 }
545 545
546 if (!sr->clk_length) 546 if (!sr->clk_length)
@@ -626,7 +626,7 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
626 if (IS_ERR(sr)) { 626 if (IS_ERR(sr)) {
627 pr_warning("%s: omap_sr struct for sr_%s not found\n", 627 pr_warning("%s: omap_sr struct for sr_%s not found\n",
628 __func__, voltdm->name); 628 __func__, voltdm->name);
629 return -EINVAL; 629 return PTR_ERR(sr);
630 } 630 }
631 631
632 volt_data = omap_voltage_get_voltdata(sr->voltdm, volt); 632 volt_data = omap_voltage_get_voltdata(sr->voltdm, volt);
@@ -634,7 +634,7 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
634 if (IS_ERR(volt_data)) { 634 if (IS_ERR(volt_data)) {
635 dev_warn(&sr->pdev->dev, "%s: Unable to get voltage table" 635 dev_warn(&sr->pdev->dev, "%s: Unable to get voltage table"
636 "for nominal voltage %ld\n", __func__, volt); 636 "for nominal voltage %ld\n", __func__, volt);
637 return -ENODATA; 637 return PTR_ERR(volt_data);
638 } 638 }
639 639
640 nvalue_reciprocal = sr_retrieve_nvalue(sr, volt_data->sr_efuse_offs); 640 nvalue_reciprocal = sr_retrieve_nvalue(sr, volt_data->sr_efuse_offs);
@@ -1079,7 +1079,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
1079 if (IS_ERR(sr_info)) { 1079 if (IS_ERR(sr_info)) {
1080 dev_warn(&pdev->dev, "%s: omap_sr struct not found\n", 1080 dev_warn(&pdev->dev, "%s: omap_sr struct not found\n",
1081 __func__); 1081 __func__);
1082 return -EINVAL; 1082 return PTR_ERR(sr_info);
1083 } 1083 }
1084 1084
1085 if (sr_info->autocomp_active) 1085 if (sr_info->autocomp_active)