Commit 6e05542f authored Aug 20, 2019 by Andrey Smirnov Committed by Herbert Xu Aug 30, 2019

crypto: caam - drop 64-bit only wr/rd_reg64()



Since 32-bit of both wr_reg64 and rd_reg64 now use 64-bit IO helpers,
these functions should no longer be necessary. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 393d2d0f

drivers/crypto/caam/regs.h

+0 −19

Original line number	Diff line number	Diff line
		@@ -138,24 +138,6 @@ static inline void clrsetbits_32(void __iomem *reg, u32 clear, u32 set)
		* base + 0x0000 : least-significant 32 bits
		* base + 0x0004 : most-significant 32 bits
		*/
		#ifdef CONFIG_64BIT
		static inline void wr_reg64(void __iomem *reg, u64 data)
		{
		if (caam_little_end)
		iowrite64(data, reg);
		else
		iowrite64be(data, reg);
		}

		static inline u64 rd_reg64(void __iomem *reg)
		{
		if (caam_little_end)
		return ioread64(reg);
		else
		return ioread64be(reg);
		}

		#else /* CONFIG_64BIT */
		static inline void wr_reg64(void __iomem *reg, u64 data)
		{
		if (caam_little_end) {
		@@ -187,7 +169,6 @@ static inline u64 rd_reg64(void __iomem *reg)
		return ioread64be(reg);
		}
		}
		#endif /* CONFIG_64BIT */

		static inline u64 cpu_to_caam_dma64(dma_addr_t value)
		{