aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/mfp-pxa2xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-pxa/mfp-pxa2xx.c')
-rw-r--r--arch/arm/mach-pxa/mfp-pxa2xx.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index ef0426a159d4..666b78972c40 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -93,8 +93,8 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
93 break; 93 break;
94 default: 94 default:
95 /* warning and fall through, treat as MFP_LPM_DEFAULT */ 95 /* warning and fall through, treat as MFP_LPM_DEFAULT */
96 pr_warning("%s: GPIO%d: unsupported low power mode\n", 96 pr_warn("%s: GPIO%d: unsupported low power mode\n",
97 __func__, gpio); 97 __func__, gpio);
98 break; 98 break;
99 } 99 }
100 100
@@ -107,14 +107,12 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
107 * configurations of those pins not able to wakeup 107 * configurations of those pins not able to wakeup
108 */ 108 */
109 if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) { 109 if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) {
110 pr_warning("%s: GPIO%d unable to wakeup\n", 110 pr_warn("%s: GPIO%d unable to wakeup\n", __func__, gpio);
111 __func__, gpio);
112 return -EINVAL; 111 return -EINVAL;
113 } 112 }
114 113
115 if ((c & MFP_LPM_CAN_WAKEUP) && is_out) { 114 if ((c & MFP_LPM_CAN_WAKEUP) && is_out) {
116 pr_warning("%s: output GPIO%d unable to wakeup\n", 115 pr_warn("%s: output GPIO%d unable to wakeup\n", __func__, gpio);
117 __func__, gpio);
118 return -EINVAL; 116 return -EINVAL;
119 } 117 }
120 118
@@ -126,7 +124,7 @@ static inline int __mfp_validate(int mfp)
126 int gpio = mfp_to_gpio(mfp); 124 int gpio = mfp_to_gpio(mfp);
127 125
128 if ((mfp > MFP_PIN_GPIO127) || !gpio_desc[gpio].valid) { 126 if ((mfp > MFP_PIN_GPIO127) || !gpio_desc[gpio].valid) {
129 pr_warning("%s: GPIO%d is invalid pin\n", __func__, gpio); 127 pr_warn("%s: GPIO%d is invalid pin\n", __func__, gpio);
130 return -1; 128 return -1;
131 } 129 }
132 130