[tip:locking/core] locking/atomic, crypto/nx: Prepare for atomic64_read() conversion

[tip-bot for Mark Rutland]

Commit-ID:  90fde663aed0a1c27e50dd1bf3f121141b2fe9f2
Gitweb:     https://git.kernel.org/tip/90fde663aed0a1c27e50dd1bf3f121141b2fe9f2
Author:     Mark Rutland <mark.rutl...@arm.com>
AuthorDate: Wed, 22 May 2019 14:22:33 +0100
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Mon, 3 Jun 2019 12:32:56 +0200

locking/atomic, crypto/nx: Prepare for atomic64_read() conversion

The return type of atomic64_read() varies by architecture. It may return
long (e.g. powerpc), long long (e.g. arm), or s64 (e.g. x86_64). This is
somewhat painful, and mandates the use of explicit casts in some cases
(e.g. when printing the return value).

To ameliorate matters, subsequent patches will make the atomic64 API
consistently use s64.

As a preparatory step, this patch updates the nx-842 code to treat the
return value of atomic64_read() as s64, using explicit casts. These
casts will be removed once the s64 conversion is complete.

Signed-off-by: Mark Rutland <mark.rutl...@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Cc: Herbert Xu <herb...@gondor.apana.org.au>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Will Deacon <will.dea...@arm.com>
Cc: a...@eecs.berkeley.edu
Cc: a...@arndb.de
Cc: b...@alien8.de
Cc: catalin.mari...@arm.com
Cc: da...@davemloft.net
Cc: fenghua...@intel.com
Cc: heiko.carst...@de.ibm.com
Cc: i...@jurassic.park.msu.ru
Cc: jho...@kernel.org
Cc: li...@armlinux.org.uk
Cc: matts...@gmail.com
Cc: m...@ellerman.id.au
Cc: pal...@sifive.com
Cc: paul.bur...@mips.com
Cc: pau...@samba.org
Cc: r...@linux-mips.org
Cc: r...@twiddle.net
Cc: tony.l...@intel.com
Cc: vgu...@synopsys.com
Link: https://lkml.kernel.org/r/20190522132250.26499-2-mark.rutl...@arm.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 drivers/crypto/nx/nx-842-pseries.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/nx/nx-842-pseries.c 
b/drivers/crypto/nx/nx-842-pseries.c
index 5c4aa606208c..938332ce3b60 100644
--- a/drivers/crypto/nx/nx-842-pseries.c
+++ b/drivers/crypto/nx/nx-842-pseries.c
@@ -856,8 +856,8 @@ static ssize_t nx842_##_name##_show(struct device *dev,     
        \
        rcu_read_lock();                                                \
        local_devdata = rcu_dereference(devdata);                       \
        if (local_devdata)                                              \
-               p = snprintf(buf, PAGE_SIZE, "%ld\n",                   \
-                      atomic64_read(&local_devdata->counters->_name)); \
+               p = snprintf(buf, PAGE_SIZE, "%lld\n",                  \
+                      (s64)atomic64_read(&local_devdata->counters->_name));    
\
        rcu_read_unlock();                                              \
        return p;                                                       \
 }
@@ -909,17 +909,17 @@ static ssize_t nx842_timehist_show(struct device *dev,
        }
 
        for (i = 0; i < (NX842_HIST_SLOTS - 2); i++) {
-               bytes = snprintf(p, bytes_remain, "%u-%uus:\t%ld\n",
+               bytes = snprintf(p, bytes_remain, "%u-%uus:\t%lld\n",
                               i ? (2<<(i-1)) : 0, (2<<i)-1,
-                              atomic64_read(&times[i]));
+                              (s64)atomic64_read(&times[i]));
                bytes_remain -= bytes;
                p += bytes;
        }
        /* The last bucket holds everything over
         * 2<<(NX842_HIST_SLOTS - 2) us */
-       bytes = snprintf(p, bytes_remain, "%uus - :\t%ld\n",
+       bytes = snprintf(p, bytes_remain, "%uus - :\t%lld\n",
                        2<<(NX842_HIST_SLOTS - 2),
-                       atomic64_read(&times[(NX842_HIST_SLOTS - 1)]));
+                       (s64)atomic64_read(&times[(NX842_HIST_SLOTS - 1)]));
        p += bytes;
 
        rcu_read_unlock();