diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-05-22 09:46:30 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-05-25 08:42:23 +0300 |
| commit | 34097f5d6a4ee5a6eb7c9ffdbf222ef1a2e09fd5 (patch) | |
| tree | c677492640f6f2de094fbabd2efc1549bb5c8e04 | |
| parent | 9c7106053ac5256083410a832736e1ef0a2eedac (diff) | |
| download | linux-34097f5d6a4ee5a6eb7c9ffdbf222ef1a2e09fd5.tar.xz | |
fsi/scom: Fixup endian annotations
Use the proper annotated type __be32 and fixup the
accessor used for get_scom()
OpenBMC-Staging-Count: 1
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
| -rw-r--r-- | drivers/fsi/fsi-scom.c | 9 |
1 files 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; |