1 files changed, 8 insertions, 6 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0ec612959042..072fe8c93e6f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -362,7 +362,7 @@ struct ide_drive_s;
 struct ide_disk_ops {
         int             (*check)(struct ide_drive_s *, const char *);
         int             (*get_capacity)(struct ide_drive_s *);
-        u64             (*set_capacity)(struct ide_drive_s *, u64);
+        void            (*unlock_native_capacity)(struct ide_drive_s *);
         void            (*setup)(struct ide_drive_s *);
         void            (*flush)(struct ide_drive_s *);
         int             (*init_media)(struct ide_drive_s *, struct gendisk *);
@@ -458,7 +458,7 @@ enum {
         IDE_DFLAG_DOORLOCKING           = (1 << 15),
         /* disallow DMA */
         IDE_DFLAG_NODMA                 = (1 << 16),
-        /* powermanagment told us not to do anything, so sleep nicely */
+        /* powermanagement told us not to do anything, so sleep nicely */
         IDE_DFLAG_BLOCKED               = (1 << 17),
         /* sleeping & sleep field valid */
         IDE_DFLAG_SLEEPING              = (1 << 18),
@@ -515,7 +515,9 @@ struct ide_drive_s {
         u8      init_speed;     /* transfer rate set at boot */
         u8      current_speed;  /* current transfer rate set */
         u8      desired_speed;  /* desired transfer rate set */
-        u8      dn;             /* now wide spread use */
+        u8      pio_mode;       /* for ->set_pio_mode _only_ */
+        u8      dma_mode;       /* for ->set_dma_mode _only_ */
+        u8      dn;             /* now wide spread use */
         u8      acoustic;       /* acoustic management */
         u8      media;          /* disk, cdrom, tape, floppy, ... */
         u8      ready_stat;     /* min status value for drive ready */
@@ -622,8 +624,8 @@ extern const struct ide_tp_ops default_tp_ops;
  */
 struct ide_port_ops {
         void    (*init_dev)(ide_drive_t *);
-        void    (*set_pio_mode)(ide_drive_t *, const u8);
-        void    (*set_dma_mode)(ide_drive_t *, const u8);
+        void    (*set_pio_mode)(struct hwif_s *, ide_drive_t *);
+        void    (*set_dma_mode)(struct hwif_s *, ide_drive_t *);
         int     (*reset_poll)(ide_drive_t *);
         void    (*pre_reset)(ide_drive_t *);
         void    (*resetproc)(ide_drive_t *);
@@ -1167,6 +1169,7 @@ extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);
 extern void ide_timer_expiry(unsigned long);
 extern irqreturn_t ide_intr(int irq, void *dev_id);
 extern void do_ide_request(struct request_queue *);
+extern void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq);
 
 void ide_init_disk(struct gendisk *, ide_drive_t *);
 
@@ -1494,7 +1497,6 @@ int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
 #ifdef CONFIG_IDE_XFER_MODE
 int ide_scan_pio_blacklist(char *);
 const char *ide_xfer_verbose(u8);
-u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
 int ide_pio_need_iordy(ide_drive_t *, const u8);
 int ide_set_pio_mode(ide_drive_t *, u8);
 int ide_set_dma_mode(ide_drive_t *, u8);