Commit 3f023b01 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: don't set hwif->dma_ops in init_dma() method 



Replace setting of 'hwif->dma_ops' in the 'alim15x3' and 'palm_bk3710' drivers'
init_dma() methods with initializing the corresponding member of their 'struct
ide_port_info' instances and remove such setting from the 'hpt366' driver that
just doesn't use 'sff_dma_ops'. Along with some code save, this prepares us for
the next patch...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 391ad190

drivers/ide/alim15x3.c

+1 −2
Original line number Diff line number Diff line
@@ -490,8 +490,6 @@ static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, 
	if (ide_allocate_dma_engine(hwif))

		return -1;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}
@@ -519,6 +517,7 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { 
	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.port_ops	= &ali_port_ops,

	.dma_ops	= &sff_dma_ops,

	.pio_mask	= ATA_PIO5,

	.swdma_mask	= ATA_SWDMA2,

	.mwdma_mask	= ATA_MWDMA2,

drivers/ide/hpt366.c

+0 −2
Original line number Diff line number Diff line
@@ -1349,8 +1349,6 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif, 
	if (ide_allocate_dma_engine(hwif))

		return -1;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}

drivers/ide/palm_bk3710.c

+1 −2
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif, 


	hwif->dma_base = hwif->io_ports.data_addr - IDE_PALM_ATA_PRI_REG_OFFSET;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}
@@ -338,6 +336,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = { 
static struct ide_port_info __devinitdata palm_bk3710_port_info = {

	.init_dma		= palm_bk3710_init_dma,

	.port_ops		= &palm_bk3710_ports_ops,

	.dma_ops		= &sff_dma_ops,

	.host_flags		= IDE_HFLAG_MMIO,

	.pio_mask		= ATA_PIO4,

	.mwdma_mask		= ATA_MWDMA2,

CRA Git | Maintained and supported by SUSTech CRA and CCSE