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

Commit 10738ba8 authored Oct 17, 2017 by Kees Cook

ide: 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: "David S. Miller" <davem@davemloft.net>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>

parent 2bccef39

drivers/ide/ide-io.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -611,9 +611,9 @@ static int drive_is_ready(ide_drive_t *drive)
	* logic that wants cleaning up.		* logic that wants cleaning up.
	*/		*/

	void ide_timer_expiry (unsigned long data)		void ide_timer_expiry (struct timer_list *t)
	{		{
	ide_hwif_t hwif = (ide_hwif_t )data;		ide_hwif_t *hwif = from_timer(hwif, t, timer);
	ide_drive_t *uninitialized_var(drive);		ide_drive_t *uninitialized_var(drive);
	ide_handler_t *handler;		ide_handler_t *handler;
	unsigned long flags;		unsigned long flags;

drivers/ide/ide-probe.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1184,7 +1184,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)

	spin_lock_init(&hwif->lock);		spin_lock_init(&hwif->lock);

	setup_timer(&hwif->timer, &ide_timer_expiry, (unsigned long)hwif);		timer_setup(&hwif->timer, ide_timer_expiry, 0);

	init_completion(&hwif->gendev_rel_comp);		init_completion(&hwif->gendev_rel_comp);

include/linux/ide.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1211,7 +1211,7 @@ extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout);

	extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);		extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);

	extern void ide_timer_expiry(unsigned long);		extern void ide_timer_expiry(struct timer_list *t);
	extern irqreturn_t ide_intr(int irq, void *dev_id);		extern irqreturn_t ide_intr(int irq, void *dev_id);
	extern void do_ide_request(struct request_queue *);		extern void do_ide_request(struct request_queue *);
	extern void ide_requeue_and_plug(ide_drive_t drive, struct request rq);		extern void ide_requeue_and_plug(ide_drive_t drive, struct request rq);