Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[linux-2.6-block.git] / drivers / ata / libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 36ea7b59e88d21c825f0a2a971c3620938332aae..2a882929de4aa3cfcce6b46de459ee7f7360a075 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5983,9 +5983,8 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
        INIT_LIST_HEAD(&ap->eh_done_q);
        init_waitqueue_head(&ap->eh_wait_q);
        init_completion(&ap->park_req_pending);
-       setup_deferrable_timer(&ap->fastdrain_timer,
-                              ata_eh_fastdrain_timerfn,
-                              (unsigned long)ap);
+       timer_setup(&ap->fastdrain_timer, ata_eh_fastdrain_timerfn,
+                   TIMER_DEFERRABLE);
 
        ap->cbl = ATA_CBL_NONE;