diff options
Diffstat (limited to 'arch/arm/common')
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 5972df2b9af4..c8e78d96e592 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -153,7 +153,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
153 | sharpsl_pm.battstat.mainbat_percent = percent; | 153 | sharpsl_pm.battstat.mainbat_percent = percent; |
154 | } | 154 | } |
155 | 155 | ||
156 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %d\n", voltage, | 156 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, |
157 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); | 157 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); |
158 | 158 | ||
159 | /* If battery is low. limit backlight intensity to save power. */ | 159 | /* If battery is low. limit backlight intensity to save power. */ |
@@ -625,7 +625,7 @@ static int sharpsl_fatal_check(void) | |||
625 | } | 625 | } |
626 | 626 | ||
627 | temp = get_select_val(buff); | 627 | temp = get_select_val(buff); |
628 | dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT)); | 628 | dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %ld\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT)); |
629 | 629 | ||
630 | if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) || | 630 | if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) || |
631 | (!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt))) | 631 | (!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt))) |
@@ -774,6 +774,8 @@ static struct pm_ops sharpsl_pm_ops = { | |||
774 | 774 | ||
775 | static int __init sharpsl_pm_probe(struct platform_device *pdev) | 775 | static int __init sharpsl_pm_probe(struct platform_device *pdev) |
776 | { | 776 | { |
777 | int ret; | ||
778 | |||
777 | if (!pdev->dev.platform_data) | 779 | if (!pdev->dev.platform_data) |
778 | return -EINVAL; | 780 | return -EINVAL; |
779 | 781 | ||
@@ -792,8 +794,10 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) | |||
792 | 794 | ||
793 | sharpsl_pm.machinfo->init(); | 795 | sharpsl_pm.machinfo->init(); |
794 | 796 | ||
795 | device_create_file(&pdev->dev, &dev_attr_battery_percentage); | 797 | ret = device_create_file(&pdev->dev, &dev_attr_battery_percentage); |
796 | device_create_file(&pdev->dev, &dev_attr_battery_voltage); | 798 | ret |= device_create_file(&pdev->dev, &dev_attr_battery_voltage); |
799 | if (ret != 0) | ||
800 | dev_warn(&pdev->dev, "Failed to register attributes (%d)\n", ret); | ||
797 | 801 | ||
798 | apm_get_power_status = sharpsl_apm_get_power_status; | 802 | apm_get_power_status = sharpsl_apm_get_power_status; |
799 | 803 | ||