Commit 56868a46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE updates from David Miller:
 "Two small cleanups in the IDE layer"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: don't call memcpy with the same source and destination
  ide: use setup_timer
parents 7fc22f45 acfead32

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err) 


		if (cmd->tf_flags & IDE_TFLAG_DYN)

			kfree(orig_cmd);

		else

		else if (cmd != orig_cmd)

			memcpy(orig_cmd, cmd, sizeof(*cmd));

	}

}

drivers/ide/ide-probe.c

+1 −3
Original line number Diff line number Diff line
@@ -1183,9 +1183,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) 


	spin_lock_init(&hwif->lock);



	init_timer(&hwif->timer);

	hwif->timer.function = &ide_timer_expiry;

	hwif->timer.data = (unsigned long)hwif;

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



	init_completion(&hwif->gendev_rel_comp);