Skip to content

Commit

Permalink
au1xxx-ide: use ->init_dma method
Browse files Browse the repository at this point in the history
* Pass 'ide_hwif_t *hwif' instead of '_auide_hwif *auide' to
  auide_ddma_init().

* Add 'const struct ide_port_info *d' argument to auide_ddma_init().

* Convert the driver to use ->init_dma method.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Apr 26, 2008
1 parent b552a2c commit 8552865
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions drivers/ide/mips/au1xxx-ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,12 @@ static void auide_dma_timeout(ide_drive_t *drive)

hwif->ide_dma_end(drive);
}


static int auide_ddma_init(_auide_hwif *auide) {

static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
{
_auide_hwif *auide = (_auide_hwif *)hwif->hwif_data;
dbdev_tab_t source_dev_tab, target_dev_tab;
u32 dev_id, tsize, devwidth, flags;
ide_hwif_t *hwif = auide->hwif;

dev_id = AU1XXX_ATA_DDMA_REQ;

Expand Down Expand Up @@ -443,9 +442,9 @@ static int auide_ddma_init(_auide_hwif *auide) {
return 0;
}
#else

static int auide_ddma_init( _auide_hwif *auide )
static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
{
_auide_hwif *auide = (_auide_hwif *)hwif->hwif_data;
dbdev_tab_t source_dev_tab;
int flags;

Expand Down Expand Up @@ -510,9 +509,9 @@ static const struct ide_port_ops au1xxx_port_ops = {
};

static const struct ide_port_info au1xxx_port_info = {
.init_dma = auide_ddma_init,
.port_ops = &au1xxx_port_ops,
.host_flags = IDE_HFLAG_POST_SET_MODE |
IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
IDE_HFLAG_NO_IO_32BIT |
IDE_HFLAG_UNMASK_IRQS,
.pio_mask = ATA_PIO4,
Expand Down Expand Up @@ -606,8 +605,6 @@ static int au_ide_probe(struct device *dev)
auide_hwif.hwif = hwif;
hwif->hwif_data = &auide_hwif;

auide_ddma_init(&auide_hwif);

idx[0] = hwif->index;

ide_device_add(idx, &au1xxx_port_info);
Expand Down

0 comments on commit 8552865

Please sign in to comment.