treewide: Convert del_timer*() to timer_shutdown*()

[platform/kernel/linux-starfive.git] / drivers / pcmcia / yenta_socket.c

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 3966a6c..1365eaa 100644 (file)
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -814,7 +814,7 @@ static void yenta_close(struct pci_dev *dev)
        if (sock->cb_irq)
                free_irq(sock->cb_irq, sock);
        else
-               del_timer_sync(&sock->poll_timer);
+               timer_shutdown_sync(&sock->poll_timer);
 
        iounmap(sock->base);
        yenta_free_resources(sock);
@@ -1285,7 +1285,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (socket->cb_irq)
                free_irq(socket->cb_irq, socket);
        else
-               del_timer_sync(&socket->poll_timer);
+               timer_shutdown_sync(&socket->poll_timer);
  unmap:
        iounmap(socket->base);
        yenta_free_resources(socket);