lkml.org 
[lkml]   [2018]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [RFC PATCH 3/5] fsi/scom: Fixup endian annotations
From
Date


On 06/12/2018 12:19 AM, Benjamin Herrenschmidt wrote:
> Use the proper annotated type __be32 and fixup the
> accessor used for get_scom()
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Reviewed-by: Eddie James <eajames@linux.vnet.ibm.com>

> ---
> drivers/fsi/fsi-scom.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
> index 8a608db0aa07..6ddfb6021420 100644
> --- a/drivers/fsi/fsi-scom.c
> +++ b/drivers/fsi/fsi-scom.c
> @@ -51,8 +51,8 @@ static DEFINE_IDA(scom_ida);
> static int put_scom(struct scom_device *scom_dev, uint64_t value,
> uint32_t addr)
> {
> + __be32 data;
> int rc;
> - uint32_t data;
>
> mutex_lock(&scom_dev->lock);
>
> @@ -79,7 +79,7 @@ static int put_scom(struct scom_device *scom_dev, uint64_t value,
> static int get_scom(struct scom_device *scom_dev, uint64_t *value,
> uint32_t addr)
> {
> - uint32_t result, data;
> + __be32 result, data;
> int rc;
>
>
> @@ -96,14 +96,13 @@ static int get_scom(struct scom_device *scom_dev, uint64_t *value,
> if (rc)
> goto bail;
>
> - *value |= (uint64_t)cpu_to_be32(result) << 32;
> + *value |= (uint64_t)be32_to_cpu(result) << 32;
> rc = fsi_device_read(scom_dev->fsi_dev, SCOM_DATA1_REG, &result,
> sizeof(uint32_t));
> if (rc)
> goto bail;
>
> - *value |= cpu_to_be32(result);
> -
> + *value |= be32_to_cpu(result);
> bail:
> mutex_unlock(&scom_dev->lock);
> return rc;

\
 
 \ /
  Last update: 2018-06-13 16:58    [W:0.088 / U:89.616 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site