[PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP

[PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP

[Petr Vorel]

Fix backport of commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.

Update backport to change ENOTSUPP to EOPNOTSUPP in
alarm_timer_{del,set}(), which were removed in
f2c45807d3992fe0f173f34af9c347d907c31686 in v4.13-rc1.

Fixes: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 kernel/time/alarmtimer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index a519d3cab1a2..6aef4a0bed29 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -586,7 +586,7 @@ static void alarm_timer_get(struct k_itimer *timr,
 static int alarm_timer_del(struct k_itimer *timr)
 {
 	if (!rtcdev)
-		return -ENOTSUPP;
+		return -EOPNOTSUPP;
 
 	if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
 		return TIMER_RETRY;
@@ -610,7 +610,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
 	ktime_t exp;
 
 	if (!rtcdev)
-		return -ENOTSUPP;
+		return -EOPNOTSUPP;
 
 	if (flags & ~TIMER_ABSTIME)
 		return -EINVAL;
-- 
2.16.4

Re: [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP

[Thadeu Lima de Souza Cascardo]

On Fri, Nov 08, 2019 at 04:50:50PM +0100, Petr Vorel wrote:
> Fix backport of commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
> 
> Update backport to change ENOTSUPP to EOPNOTSUPP in
> alarm_timer_{del,set}(), which were removed in
> f2c45807d3992fe0f173f34af9c347d907c31686 in v4.13-rc1.
> 
> Fixes: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>

Nice catch!

Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

> ---
>  kernel/time/alarmtimer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
> index a519d3cab1a2..6aef4a0bed29 100644
> --- a/kernel/time/alarmtimer.c
> +++ b/kernel/time/alarmtimer.c
> @@ -586,7 +586,7 @@ static void alarm_timer_get(struct k_itimer *timr,
>  static int alarm_timer_del(struct k_itimer *timr)
>  {
>  	if (!rtcdev)
> -		return -ENOTSUPP;
> +		return -EOPNOTSUPP;
>  
>  	if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
>  		return TIMER_RETRY;
> @@ -610,7 +610,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
>  	ktime_t exp;
>  
>  	if (!rtcdev)
> -		return -ENOTSUPP;
> +		return -EOPNOTSUPP;
>  
>  	if (flags & ~TIMER_ABSTIME)
>  		return -EINVAL;
> -- 
> 2.16.4
> 

Re: [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP

[Greg KH]

On Fri, Nov 08, 2019 at 04:50:50PM +0100, Petr Vorel wrote:
> Fix backport of commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
> 
> Update backport to change ENOTSUPP to EOPNOTSUPP in
> alarm_timer_{del,set}(), which were removed in
> f2c45807d3992fe0f173f34af9c347d907c31686 in v4.13-rc1.
> 
> Fixes: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
>  kernel/time/alarmtimer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks for both backports, now queued up.

greg k-h