2014-01-13 20:10:47

by Joe Borg

Subject: [PATCH] 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(-)

diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 647694f..87f2a02 100644
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -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))
--
1.8.5.2

2014-01-13 20:35:49

by Dan Carpenter

Subject: Re: [PATCH] AlarmDev: Changing is_wakeup() to be a function to pass checkpatch

On Mon, Jan 13, 2014 at 08:10:36PM +0000, Joe Borg wrote:
> Signed-off-by Joe Borg <[email protected]>
> ---
> drivers/staging/android/alarm-dev.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
> index 647694f..87f2a02 100644
> --- a/drivers/staging/android/alarm-dev.c
> +++ b/drivers/staging/android/alarm-dev.c
> @@ -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

2014-01-13 21:10:22

by Greg Kroah-Hartman

Subject: Re: [PATCH] AlarmDev: Changing is_wakeup() to be a function to pass checkpatch

On Mon, Jan 13, 2014 at 08:10:36PM +0000, Joe Borg wrote:
> Signed-off-by Joe Borg <[email protected]>
> ---
> drivers/staging/android/alarm-dev.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
> index 647694f..87f2a02 100644
> --- a/drivers/staging/android/alarm-dev.c
> +++ b/drivers/staging/android/alarm-dev.c
> @@ -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.

> {
> - 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.

> }
>
> -

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