Skip to content

Commit

Permalink
fsi: scom: Fixup endian annotations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Herrenschmidt committed Jun 18, 2018
1 parent bd21336 commit 5a3c2f7
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/fsi/fsi-scom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;


Expand All @@ -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;
Expand Down

0 comments on commit 5a3c2f7

Please sign in to comment.