Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93ab338 authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner
Browse files

libata: 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.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Link: https://lkml.kernel.org/r/20171005004842.GA23011@beast
parent 3c557df6

drivers/ata/libata-core.c

+2 −3
Original line number Diff line number Diff line
@@ -5979,9 +5979,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;

drivers/ata/libata-eh.c

+2 −2
Original line number Diff line number Diff line
@@ -879,9 +879,9 @@ static int ata_eh_nr_in_flight(struct ata_port *ap) 
	return nr;

}



void ata_eh_fastdrain_timerfn(unsigned long arg)

void ata_eh_fastdrain_timerfn(struct timer_list *t)

{

	struct ata_port *ap = (void *)arg;

	struct ata_port *ap = from_timer(ap, t, fastdrain_timer);

	unsigned long flags;

	int cnt;

drivers/ata/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd); 
extern void ata_eh_acquire(struct ata_port *ap);

extern void ata_eh_release(struct ata_port *ap);

extern void ata_scsi_error(struct Scsi_Host *host);

extern void ata_eh_fastdrain_timerfn(unsigned long arg);

extern void ata_eh_fastdrain_timerfn(struct timer_list *t);

extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);

extern void ata_dev_disable(struct ata_device *dev);

extern void ata_eh_detach_dev(struct ata_device *dev);