summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/axis/artpec6_crypto.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-20 01:43:19 +0200
committerKees Cook <keescook@chromium.org>2017-11-06 21:49:44 +0100
commitf34d8d506eeff1375f0b3533839ce0b77b748437 (patch)
tree82a36cdbcbe0362c1475af8864b42302fde53ab6 /drivers/crypto/axis/artpec6_crypto.c
parentdrivers/pcmcia: omap1: Fix error in automated timer conversion (diff)
downloadlinux-f34d8d506eeff1375f0b3533839ce0b77b748437.tar.xz
linux-f34d8d506eeff1375f0b3533839ce0b77b748437.zip
crypto: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Lars Persson <lars.persson@axis.com> Cc: Niklas Cassel <niklas.cassel@axis.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jamie Iles <jamie@jamieiles.com> Cc: linux-arm-kernel@axis.com Cc: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Lars Persson <lars.persson@axis.com> # for axis
Diffstat (limited to 'drivers/crypto/axis/artpec6_crypto.c')
-rw-r--r--drivers/crypto/axis/artpec6_crypto.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index d9fbbf01062b..6b515c2f2c14 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -2074,9 +2074,9 @@ static void artpec6_crypto_process_queue(struct artpec6_crypto *ac)
del_timer(&ac->timer);
}
-static void artpec6_crypto_timeout(unsigned long data)
+static void artpec6_crypto_timeout(struct timer_list *t)
{
- struct artpec6_crypto *ac = (struct artpec6_crypto *) data;
+ struct artpec6_crypto *ac = from_timer(ac, t, timer);
dev_info_ratelimited(artpec6_crypto_dev, "timeout\n");
@@ -3063,7 +3063,7 @@ static int artpec6_crypto_probe(struct platform_device *pdev)
spin_lock_init(&ac->queue_lock);
INIT_LIST_HEAD(&ac->queue);
INIT_LIST_HEAD(&ac->pending);
- setup_timer(&ac->timer, artpec6_crypto_timeout, (unsigned long) ac);
+ timer_setup(&ac->timer, artpec6_crypto_timeout, 0);
ac->base = base;