| Message ID | 1437584207-20677-1-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Michael Ellerman |
| Headers | show |
On 07/22/2015 09:56 AM, Thomas Huth wrote: > rtas.h already has some nice #defines for RTAS return status > codes - let's use them instead of hard-coded "magic" values! > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> > --- > arch/powerpc/kernel/rtas.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c > index 7a488c1..10fb402 100644 > --- a/arch/powerpc/kernel/rtas.c > +++ b/arch/powerpc/kernel/rtas.c > @@ -478,8 +478,9 @@ unsigned int rtas_busy_delay_time(int status) > > if (status == RTAS_BUSY) { > ms = 1; > - } else if (status >= 9900 && status <= 9905) { > - order = status - 9900; > + } else if (status >= RTAS_EXTENDED_DELAY_MIN && > + status <= RTAS_EXTENDED_DELAY_MAX) { > + order = status - RTAS_EXTENDED_DELAY_MIN; > for (ms = 1; order > 0; order--) > ms *= 10; > } > @@ -641,7 +642,8 @@ int rtas_set_indicator_fast(int indicator, int index, int new_value) > > rc = rtas_call(token, 3, 1, NULL, indicator, index, new_value); > > - WARN_ON(rc == -2 || (rc >= 9900 && rc <= 9905)); > + WARN_ON(rc == RTAS_BUSY || (rc >= RTAS_EXTENDED_DELAY_MIN && > + rc <= RTAS_EXTENDED_DELAY_MAX)); > > if (rc < 0) > return rtas_error_rc(rc); >
On Wed, 2015-22-07 at 16:56:47 UTC, Thomas Huth wrote: > rtas.h already has some nice #defines for RTAS return status > codes - let's use them instead of hard-coded "magic" values! > > Signed-off-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/9ef03193a93553885b43 cheers
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 7a488c1..10fb402 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -478,8 +478,9 @@ unsigned int rtas_busy_delay_time(int status) if (status == RTAS_BUSY) { ms = 1; - } else if (status >= 9900 && status <= 9905) { - order = status - 9900; + } else if (status >= RTAS_EXTENDED_DELAY_MIN && + status <= RTAS_EXTENDED_DELAY_MAX) { + order = status - RTAS_EXTENDED_DELAY_MIN; for (ms = 1; order > 0; order--) ms *= 10; } @@ -641,7 +642,8 @@ int rtas_set_indicator_fast(int indicator, int index, int new_value) rc = rtas_call(token, 3, 1, NULL, indicator, index, new_value); - WARN_ON(rc == -2 || (rc >= 9900 && rc <= 9905)); + WARN_ON(rc == RTAS_BUSY || (rc >= RTAS_EXTENDED_DELAY_MIN && + rc <= RTAS_EXTENDED_DELAY_MAX)); if (rc < 0) return rtas_error_rc(rc);
rtas.h already has some nice #defines for RTAS return status codes - let's use them instead of hard-coded "magic" values! Signed-off-by: Thomas Huth <thuth@redhat.com> --- arch/powerpc/kernel/rtas.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)