ide: set hwif->expiry prior to calling [__]ide_set_handler()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:46 +0000 (12:46 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:46 +0000 (12:46 +0100)
commit60c0cd02b254805691cdc61101ada6af7bd56fde
tree1b600eb9f22034824bf21377041f470c09af09c7
parentb788ee9c6561fd9219a503216284d61036a0dc0b
ide: set hwif->expiry prior to calling [__]ide_set_handler()

* Set hwif->expiry prior to calling [__]ide_set_handler()
  and drop 'expiry' argument.

* Set hwif->expiry to NULL in ide_{timer_expiry,intr}()
  and remove 'hwif->expiry = NULL' assignments.

There should be no functional changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-atapi.c
drivers/ide/ide-cd.c
drivers/ide/ide-eh.c
drivers/ide/ide-io.c
drivers/ide/ide-iops.c
drivers/ide/ide-taskfile.c
include/linux/ide.h