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

Commit 05732d7e authored Jul 04, 2010 by Eric Miao

[ARM] pxa: use generic gpio_get_value() instead of READ_GPIO_BIT()



READ_GPIO_BIT() is no way generic by accessing GPIO registers directly,
replace it with gpio_get_value().

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

parent 0eefe718

arch/arm/mach-pxa/corgi_pm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -134,11 +134,11 @@ unsigned long corgipm_read_devdata(int type)
		case SHARPSL_STATUS_ACIN:
		return ((GPLR(CORGI_GPIO_AC_IN) & GPIO_bit(CORGI_GPIO_AC_IN)) != 0);
		case SHARPSL_STATUS_LOCK:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batlock);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock);
		case SHARPSL_STATUS_CHRGFULL:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batfull);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_batfull);
		case SHARPSL_STATUS_FATAL:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_fatal);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_fatal);
		case SHARPSL_ACIN_VOLT:
		return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT);
		case SHARPSL_BATT_TEMP:

arch/arm/mach-pxa/spitz_pm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -178,11 +178,11 @@ unsigned long spitzpm_read_devdata(int type)
		case SHARPSL_STATUS_ACIN:
		return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0);
		case SHARPSL_STATUS_LOCK:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batlock);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock);
		case SHARPSL_STATUS_CHRGFULL:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batfull);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_batfull);
		case SHARPSL_STATUS_FATAL:
		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_fatal);
		return gpio_get_value(sharpsl_pm.machinfo->gpio_fatal);
		case SHARPSL_ACIN_VOLT:
		return sharpsl_pm_pxa_read_max1111(MAX1111_ACIN_VOLT);
		case SHARPSL_BATT_TEMP: