aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:46 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:46 -0400
commit60c0cd02b254805691cdc61101ada6af7bd56fde (patch)
tree1b600eb9f22034824bf21377041f470c09af09c7 /include/linux
parentb788ee9c6561fd9219a503216284d61036a0dc0b (diff)
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e339d6646552..476f59885fda 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1135,10 +1135,8 @@ unsigned int ide_rq_bytes(struct request *);
1135int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int); 1135int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
1136void ide_kill_rq(ide_drive_t *, struct request *); 1136void ide_kill_rq(ide_drive_t *, struct request *);
1137 1137
1138void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int, 1138void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int);
1139 ide_expiry_t *); 1139void ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int);
1140void ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int,
1141 ide_expiry_t *);
1142 1140
1143void ide_execute_command(ide_drive_t *, u8, ide_handler_t *, unsigned int, 1141void ide_execute_command(ide_drive_t *, u8, ide_handler_t *, unsigned int,
1144 ide_expiry_t *); 1142 ide_expiry_t *);