From: "Luis R. Rodriguez" <redacted>

spinlock_t should always be used.

I was unable to build test with allmodconfig:

mcgrof at frijol ~/linux-next (git::(no branch))$ make C=1 M=drivers/crypto/ux500/

  WARNING: Symbol version dump /home/mcgrof/linux-next/Module.symvers
           is missing; modules will have no dependencies and modversions.

  LD      drivers/crypto/ux500/built-in.o
  Building modules, stage 2.
  MODPOST 0 modules

Cc: Srinidhi Kasagar <redacted>
Cc: Linus Walleij <redacted>
Cc: linux-arm-kernel at lists.infradead.org
Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <redacted>
---
 drivers/crypto/ux500/cryp/cryp.h     |    4 ++--
 drivers/crypto/ux500/hash/hash_alg.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/ux500/cryp/cryp.h b/drivers/crypto/ux500/cryp/cryp.h
index 14cfd05..ba324b2 100644
--- a/drivers/crypto/ux500/cryp/cryp.h
+++ b/drivers/crypto/ux500/cryp/cryp.h

@@ -236,12 +236,12 @@ struct cryp_device_data {
 	struct clk *clk;
 	struct regulator *pwr_regulator;
 	int power_status;
-	struct spinlock ctx_lock;
+	spinlock_t ctx_lock;
 	struct cryp_ctx *current_ctx;
 	struct klist_node list_node;
 	struct cryp_dma dma;
 	bool power_state;
-	struct spinlock power_state_spinlock;
+	spinlock_t power_state_spinlock;
 	bool restore_dev_ctx;
 };
 

diff --git a/drivers/crypto/ux500/hash/hash_alg.h b/drivers/crypto/ux500/hash/hash_alg.h
index cd9351c..0183f5e 100644
--- a/drivers/crypto/ux500/hash/hash_alg.h
+++ b/drivers/crypto/ux500/hash/hash_alg.h

@@ -363,10 +363,10 @@ struct hash_device_data {
 	struct hash_register __iomem	*base;
 	struct klist_node	list_node;
 	struct device		*dev;
-	struct spinlock		ctx_lock;
+	spinlock_t		ctx_lock;
 	struct hash_ctx		*current_ctx;
 	bool			power_state;
-	struct spinlock		power_state_lock;
+	spinlock_t		power_state_lock;
 	struct regulator	*regulator;
 	struct clk		*clk;
 	bool			restore_dev_state;

-- 
1.7.10.4