Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits)
  random: Reorder struct entropy_store to remove padding on 64bits
  padata: update API documentation
  padata: Remove padata_get_cpumask
  crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier
  crypto: pcrypt - Rename pcrypt_instance
  padata: Pass the padata cpumasks to the cpumask_change_notifier chain
  padata: Rearrange set_cpumask functions
  padata: Rename padata_alloc functions
  crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask
  padata: Check for valid cpumasks
  padata: Allocate cpumask dependend recources in any case
  padata: Fix cpu index counting
  crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
  pcrypt: Added sysfs interface to pcrypt
  padata: Added sysfs primitives to padata subsystem
  padata: Make two separate cpumasks
  padata: update documentation
  padata: simplify serialization mechanism
  padata: make padata_do_parallel to return zero on success
  padata: Handle empty padata cpumasks
  ...

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 16fce3aadf4d..e449ac5627a5 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2018,7 +2018,6 @@ static void hifn_flush(struct hifn_device *dev)
 {
         unsigned long flags;
         struct crypto_async_request *async_req;
-        struct hifn_context *ctx;
         struct ablkcipher_request *req;
         struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
         int i;
@@ -2035,7 +2034,6 @@ static void hifn_flush(struct hifn_device *dev)
 
         spin_lock_irqsave(&dev->lock, flags);
         while ((async_req = crypto_dequeue_request(&dev->queue))) {
-                ctx = crypto_tfm_ctx(async_req->tfm);
                 req = container_of(async_req, struct ablkcipher_request, base);
                 spin_unlock_irqrestore(&dev->lock, flags);
 
@@ -2139,7 +2137,6 @@ static int hifn_setup_crypto_req(struct ablkcipher_request *req, u8 op,
 static int hifn_process_queue(struct hifn_device *dev)
 {
         struct crypto_async_request *async_req, *backlog;
-        struct hifn_context *ctx;
         struct ablkcipher_request *req;
         unsigned long flags;
         int err = 0;
@@ -2156,7 +2153,6 @@ static int hifn_process_queue(struct hifn_device *dev)
                 if (backlog)
                         backlog->complete(backlog, -EINPROGRESS);
 
-                ctx = crypto_tfm_ctx(async_req->tfm);
                 req = container_of(async_req, struct ablkcipher_request, base);
 
                 err = hifn_handle_req(req);