Commit 592b5315 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: move read_sff_dma_status() method to 'struct ide_dma_ops' 



Move apparently misplaced read_sff_dma_status() method from 'struct ide_tp_ops'
to 'struct ide_dma_ops', renaming it to dma_sff_read_status() and making only
required for SFF-8038i compatible IDE controller drivers (greatly cutting down
the number of initializers) as its only user (outside ide-dma-sff.c and such
drivers) appears to be ide_pci_check_simplex() which is only called for such
controllers...

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

drivers/ide/alim15x3.c

+1 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info ali15x3_chipset __devinitdata = {

drivers/ide/au1xxx-ide.c

+0 −1
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ static const struct ide_tp_ops au1xxx_tp_ops = { 
	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,

	.read_sff_dma_status	= ide_read_sff_dma_status,



	.set_irq		= ide_set_irq,

drivers/ide/cmd64x.c

+3 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ static const struct ide_dma_ops cmd64x_dma_ops = { 
	.dma_test_irq		= cmd64x_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_dma_ops cmd646_rev1_dma_ops = {
@@ -396,6 +397,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_dma_ops cmd648_dma_ops = {
@@ -407,6 +409,7 @@ static const struct ide_dma_ops cmd648_dma_ops = { 
	.dma_test_irq		= cmd648_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {

drivers/ide/falconide.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static const struct ide_tp_ops falconide_tp_ops = { 
	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,

	.read_sff_dma_status	= ide_read_sff_dma_status,



	.set_irq		= ide_set_irq,

drivers/ide/hpt366.c

+3 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,7 @@ static const struct ide_dma_ops hpt37x_dma_ops = { 
	.dma_test_irq		= hpt374_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_dma_ops hpt370_dma_ops = {
@@ -1435,6 +1436,7 @@ static const struct ide_dma_ops hpt370_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= hpt370_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_dma_ops hpt36x_dma_ops = {
@@ -1446,6 +1448,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= hpt366_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info hpt366_chipsets[] __devinitdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE