ide: remove ->INB, ->OUTB and ->OUTBSYNC methods

[linux-2.6] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index e5fa5e868d67d4952d25b15301144cfe71069289..0544ff7d9afc2bf414b395fc4a3c26111bf2326f 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -494,6 +494,8 @@ typedef struct hwif_s {
        u8      (*read_altstatus)(struct hwif_s *);
        u8      (*read_sff_dma_status)(struct hwif_s *);
 
+       void    (*set_irq)(struct hwif_s *, int);
+
        void (*tf_load)(ide_drive_t *, struct ide_task_s *);
        void (*tf_read)(ide_drive_t *, struct ide_task_s *);
 
@@ -502,11 +504,6 @@ typedef struct hwif_s {
 
        void (*ide_dma_clear_irq)(ide_drive_t *drive);
 
-       void (*OUTB)(u8 addr, unsigned long port);
-       void (*OUTBSYNC)(struct hwif_s *hwif, u8 addr, unsigned long port);
-
-       u8  (*INB)(unsigned long port);
-
        /* dma physical region descriptor table (cpu view) */
        unsigned int    *dmatable_cpu;
        /* dma physical region descriptor table (dma view) */
@@ -887,6 +884,7 @@ enum {
        IDE_TFLAG_IN_HOB                = IDE_TFLAG_IN_HOB_FEATURE |
                                          IDE_TFLAG_IN_HOB_NSECT |
                                          IDE_TFLAG_IN_HOB_LBA,
+       IDE_TFLAG_IN_FEATURE            = (1 << 1),
        IDE_TFLAG_IN_NSECT              = (1 << 25),
        IDE_TFLAG_IN_LBAL               = (1 << 26),
        IDE_TFLAG_IN_LBAM               = (1 << 27),
@@ -954,6 +952,9 @@ void ide_tf_dump(const char *, struct ide_taskfile *);
 extern void SELECT_DRIVE(ide_drive_t *);
 void SELECT_MASK(ide_drive_t *, int);
 
+u8 ide_read_error(ide_drive_t *);
+void ide_read_bcount_and_ireason(ide_drive_t *, u16 *, u8 *);
+
 extern int drive_is_ready(ide_drive_t *);
 
 void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
@@ -1021,8 +1022,6 @@ static inline int ide_hwif_setup_dma(ide_hwif_t *hwif,
 }
 #endif
 
-extern void default_hwif_iops(ide_hwif_t *);
-extern void default_hwif_mmiops(ide_hwif_t *);
 extern void default_hwif_transport(ide_hwif_t *);
 
 typedef struct ide_pci_enablebit_s {
@@ -1355,19 +1354,4 @@ static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)
 
        return &hwif->drives[(drive->dn ^ 1) & 1];
 }
-
-static inline void ide_set_irq(ide_drive_t *drive, int on)
-{
-       ide_hwif_t *hwif = drive->hwif;
-
-       hwif->OUTBSYNC(hwif, ATA_DEVCTL_OBS | (on ? 0 : 2),
-                      hwif->io_ports.ctl_addr);
-}
-
-static inline u8 ide_read_error(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = drive->hwif;
-
-       return hwif->INB(hwif->io_ports.error_addr);
-}
 #endif /* _IDE_H */