crypto: atmel-{sha,tdes} - Remove unused 'err' member of driver data (9a17007b) · Commits · 戴 / test

drivers/crypto/atmel-sha.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -136,7 +136,6 @@ struct atmel_sha_dev {
		void __iomem *io_base;

		spinlock_t lock;
		int err;
		struct tasklet_struct done_task;
		struct tasklet_struct queue_task;

		@@ -1027,7 +1026,6 @@ static int atmel_sha_hw_init(struct atmel_sha_dev *dd)
		if (!(SHA_FLAGS_INIT & dd->flags)) {
		atmel_sha_write(dd, SHA_CR, SHA_CR_SWRST);
		dd->flags \|= SHA_FLAGS_INIT;
		dd->err = 0;
		}

		return 0;
		@@ -1403,10 +1401,6 @@ static int atmel_sha_done(struct atmel_sha_dev *dd)
		if (SHA_FLAGS_DMA_ACTIVE & dd->flags) {
		dd->flags &= ~SHA_FLAGS_DMA_ACTIVE;
		atmel_sha_update_dma_stop(dd);
		if (dd->err) {
		err = dd->err;
		goto finish;
		}
		}
		if (SHA_FLAGS_OUTPUT_READY & dd->flags) {
		/* hash or semi-hash ready */

+0 −4

Original line number	Diff line number	Diff line
		@@ -102,7 +102,6 @@ struct atmel_tdes_dev {
		int irq;

		unsigned long flags;
		int err;

		spinlock_t lock;
		struct crypto_queue queue;
		@@ -228,7 +227,6 @@ static int atmel_tdes_hw_init(struct atmel_tdes_dev *dd)
		if (!(dd->flags & TDES_FLAGS_INIT)) {
		atmel_tdes_write(dd, TDES_CR, TDES_CR_SWRST);
		dd->flags \|= TDES_FLAGS_INIT;
		dd->err = 0;
		}

		return 0;
		@@ -1112,8 +1110,6 @@ static void atmel_tdes_done_task(unsigned long data)
		else
		err = atmel_tdes_crypt_dma_stop(dd);

		err = dd->err ? : err;

		if (dd->total && !err) {
		if (dd->flags & TDES_FLAGS_FAST) {
		dd->in_sg = sg_next(dd->in_sg);