diff options
| -rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index a7352056389f..41cf945173a0 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
| @@ -134,11 +134,11 @@ unsigned long corgipm_read_devdata(int type) | |||
| 134 | case SHARPSL_STATUS_ACIN: | 134 | case SHARPSL_STATUS_ACIN: |
| 135 | return ((GPLR(CORGI_GPIO_AC_IN) & GPIO_bit(CORGI_GPIO_AC_IN)) != 0); | 135 | return ((GPLR(CORGI_GPIO_AC_IN) & GPIO_bit(CORGI_GPIO_AC_IN)) != 0); |
| 136 | case SHARPSL_STATUS_LOCK: | 136 | case SHARPSL_STATUS_LOCK: |
| 137 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batlock); | 137 | return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock); |
| 138 | case SHARPSL_STATUS_CHRGFULL: | 138 | case SHARPSL_STATUS_CHRGFULL: |
| 139 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batfull); | 139 | return gpio_get_value(sharpsl_pm.machinfo->gpio_batfull); |
| 140 | case SHARPSL_STATUS_FATAL: | 140 | case SHARPSL_STATUS_FATAL: |
| 141 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_fatal); | 141 | return gpio_get_value(sharpsl_pm.machinfo->gpio_fatal); |
| 142 | case SHARPSL_ACIN_VOLT: | 142 | case SHARPSL_ACIN_VOLT: |
| 143 | return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT); | 143 | return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT); |
| 144 | case SHARPSL_BATT_TEMP: | 144 | case SHARPSL_BATT_TEMP: |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index b36f0ae9dae1..53103d365fe7 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
| @@ -178,11 +178,11 @@ unsigned long spitzpm_read_devdata(int type) | |||
| 178 | case SHARPSL_STATUS_ACIN: | 178 | case SHARPSL_STATUS_ACIN: |
| 179 | return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0); | 179 | return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0); |
| 180 | case SHARPSL_STATUS_LOCK: | 180 | case SHARPSL_STATUS_LOCK: |
| 181 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batlock); | 181 | return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock); |
| 182 | case SHARPSL_STATUS_CHRGFULL: | 182 | case SHARPSL_STATUS_CHRGFULL: |
| 183 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batfull); | 183 | return gpio_get_value(sharpsl_pm.machinfo->gpio_batfull); |
| 184 | case SHARPSL_STATUS_FATAL: | 184 | case SHARPSL_STATUS_FATAL: |
| 185 | return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_fatal); | 185 | return gpio_get_value(sharpsl_pm.machinfo->gpio_fatal); |
| 186 | case SHARPSL_ACIN_VOLT: | 186 | case SHARPSL_ACIN_VOLT: |
| 187 | return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT); | 187 | return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT); |
| 188 | case SHARPSL_BATT_TEMP: | 188 | case SHARPSL_BATT_TEMP: |