AlarmDev: Changing is_wakeup() to be a function to pass checkpatch
PATCH 1/1 AlarmDev: Changing is_wakeup() to be a function to pass checkpatch
Signed-off-by Joe Borg <[email protected]>
--- drivers/staging/android/alarm-dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/android/alarm-dev.c +6 -4
@@ -66,13 +66,15 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT];* * Return: 1 if this is a wakeup alarm, otherwise 0 */ -static int is_wakeup (enum android_alarm_type type) +static int is_wakeup (enum andriod_alarm_type type) { -return (type ==ANDROID_ALARM_RTC_WAKEUP || - type ==ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP ); +if (type ==ANDROID_ALARM_RTC_WAKEUP || + type ==ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP ) +return 1 ; +else +return 0 ; } -static void devalarm_start (struct devalarm *alrm,ktime_t exp) {if (is_wakeup (alrm->type))
Signature · 1 line
1.8.5.2
Quoted 10 lines · Joe Borg
Signed-off-by Joe Borg <[email protected]>
--- drivers/staging/android/alarm-dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/staging/android/alarm-dev.c +0
-0
drivers/staging/android/alarm-dev.c static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; · line 69
Quoted 5 lines
drivers/staging/android/alarm-dev.c +1
-1@@ -66,13 +66,15 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT];* * Return: 1 if this is a wakeup alarm, otherwise 0 */ -static int is_wakeup (enum android_alarm_type type) +static int is_wakeup (enum andriod_alarm_type type)
Levente already pointed out that this breaks the build. Really Levente said was spot on and still applies to the v2 of the patch.
regards,
dan carpenter
Greg KH
maintainerQuoted 10 lines · Joe Borg
Signed-off-by Joe Borg <[email protected]>
--- drivers/staging/android/alarm-dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/staging/android/alarm-dev.c +0
-0
drivers/staging/android/alarm-dev.c static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; · line 69
Quoted 5 lines
drivers/staging/android/alarm-dev.c +1
-1@@ -66,13 +66,15 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT];* * Return: 1 if this is a wakeup alarm, otherwise 0 */ -static int is_wakeup (enum android_alarm_type type) +static int is_wakeup (enum andriod_alarm_type type)
Always build test your patches, this one wasn't.
drivers/staging/android/alarm-dev.c static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; · line 75
Quoted 8 lines
drivers/staging/android/alarm-dev.c +5
-2{ -return (type ==ANDROID_ALARM_RTC_WAKEUP || - type ==ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP ); +if (type ==ANDROID_ALARM_RTC_WAKEUP || + type ==ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP ) +return 1 ; +else +return 0 ;
Why are you making this change? There is no logic change here at all.
drivers/staging/android/alarm-dev.c static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; · line 75
Quoted 3 lines
drivers/staging/android/alarm-dev.c +0
-1} -
Why remove this line?
Again, you are going to need changelog comments for any patch, please redo them properly if you wish us to accept your patches.
thanks,
greg k-h