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

Commit a93fc153 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IDE fix from David Miller:
 "Just one fix to convert a by-hand conversion of jiffies to msecs, from
  Nicholas McGuire"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide_tape: convert jiffies with jiffies_to_msecs
parents 22283c82 84215964

drivers/ide/ide-tape.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1793,11 +1793,11 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
	tape->best_dsc_rw_freq = clamp_t(unsigned long, t, IDETAPE_DSC_RW_MIN,

	tape->best_dsc_rw_freq = clamp_t(unsigned long, t, IDETAPE_DSC_RW_MIN,

					 IDETAPE_DSC_RW_MAX);

					 IDETAPE_DSC_RW_MAX);

	printk(KERN_INFO "ide-tape: %s <-> %s: %dKBps, %d*%dkB buffer, "

	printk(KERN_INFO "ide-tape: %s <-> %s: %dKBps, %d*%dkB buffer, "

		"%lums tDSC%s\n",

		"%ums tDSC%s\n",

		drive->name, tape->name, *(u16 *)&tape->caps[14],

		drive->name, tape->name, *(u16 *)&tape->caps[14],

		(*(u16 *)&tape->caps[16] * 512) / tape->buffer_size,

		(*(u16 *)&tape->caps[16] * 512) / tape->buffer_size,

		tape->buffer_size / 1024,

		tape->buffer_size / 1024,

		tape->best_dsc_rw_freq * 1000 / HZ,

		jiffies_to_msecs(tape->best_dsc_rw_freq),

		(drive->dev_flags & IDE_DFLAG_USING_DMA) ? ", DMA" : "");

		(drive->dev_flags & IDE_DFLAG_USING_DMA) ? ", DMA" : "");





	ide_proc_register_driver(drive, tape->driver);

	ide_proc_register_driver(drive, tape->driver);