Commit 13822b20 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] exterminate unused io_ops structures and switch to ulong

The iops struct may be a good idea in the longer run but right now its
unused and its mess that can be restored neatly later on.
parent de26e781
...@@ -305,36 +305,18 @@ typedef enum { ide_unknown, ide_generic, ide_pci, ...@@ -305,36 +305,18 @@ typedef enum { ide_unknown, ide_generic, ide_pci,
ide_pmac, ide_etrax100, ide_acorn ide_pmac, ide_etrax100, ide_acorn
} hwif_chipset_t; } hwif_chipset_t;
typedef struct ide_io_ops_s {
/* insert io operations here! */
void (*OUTB)(u8 value, ide_ioreg_t port);
void (*OUTW)(u16 value, ide_ioreg_t port);
void (*OUTL)(u32 value, ide_ioreg_t port);
void (*OUTSW)(ide_ioreg_t port, void *addr, u32 count);
void (*OUTSL)(ide_ioreg_t port, void *addr, u32 count);
u8 (*INB)(ide_ioreg_t port);
u16 (*INW)(ide_ioreg_t port);
u32 (*INL)(ide_ioreg_t port);
void (*INSW)(ide_ioreg_t port, void *addr, u32 count);
void (*INSL)(ide_ioreg_t port, void *addr, u32 count);
} ide_io_ops_t;
/* /*
* Structure to hold all information about the location of this port * Structure to hold all information about the location of this port
*/ */
typedef struct hw_regs_s { typedef struct hw_regs_s {
ide_ioreg_t io_ports[IDE_NR_PORTS]; /* task file registers */ unsigned long io_ports[IDE_NR_PORTS]; /* task file registers */
int irq; /* our irq number */ int irq; /* our irq number */
int dma; /* our dma entry */ int dma; /* our dma entry */
ide_ack_intr_t *ack_intr; /* acknowledge interrupt */ ide_ack_intr_t *ack_intr; /* acknowledge interrupt */
void *priv; /* interface specific data */ void *priv; /* interface specific data */
hwif_chipset_t chipset; hwif_chipset_t chipset;
#if 0 unsigned long sata_scr[SATA_NR_PORTS];
ide_io_ops_t *iops; /* */ unsigned long sata_misc[SATA_NR_PORTS];
#endif
sata_ioreg_t sata_scr[SATA_NR_PORTS];
sata_ioreg_t sata_misc[SATA_NR_PORTS];
} hw_regs_t; } hw_regs_t;
/* /*
...@@ -346,10 +328,10 @@ int ide_register_hw(hw_regs_t *hw, struct hwif_s **hwifp); ...@@ -346,10 +328,10 @@ int ide_register_hw(hw_regs_t *hw, struct hwif_s **hwifp);
* Set up hw_regs_t structure before calling ide_register_hw (optional) * Set up hw_regs_t structure before calling ide_register_hw (optional)
*/ */
void ide_setup_ports( hw_regs_t *hw, void ide_setup_ports( hw_regs_t *hw,
ide_ioreg_t base, unsigned long base,
int *offsets, int *offsets,
ide_ioreg_t ctrl, unsigned long ctrl,
ide_ioreg_t intr, unsigned long intr,
ide_ack_intr_t *ack_intr, ide_ack_intr_t *ack_intr,
#if 0 #if 0
ide_io_ops_t *iops, ide_io_ops_t *iops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment