From: Tejun Heo Date: Tue, 25 Mar 2008 12:35:30 +0000 (+0900) Subject: pdc_adma: inherit ata_sff_port_ops X-Git-Tag: v2.6.26-rc1~1150^2~45 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b0316b15ace0570c87b74c81f1296cf7bf8d459e;p=linux-2.6-omap-h63xx.git pdc_adma: inherit ata_sff_port_ops With the previous ops standardization, pdc_adma now can inherit ata_sff_port_ops instead of ata_base_port_ops. Make the change. Signed-off-by: Tejun Heo Cc: Mark Lord Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 577a0e556f7..6a4654e309a 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c @@ -147,25 +147,15 @@ static struct scsi_host_template adma_ata_sht = { }; static struct ata_port_operations adma_ata_ops = { - .inherits = &ata_base_port_ops, - - .dev_select = ata_std_dev_select, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .data_xfer = ata_data_xfer, + .inherits = &ata_sff_port_ops, + .check_atapi_dma = adma_check_atapi_dma, .qc_prep = adma_qc_prep, .qc_issue = adma_qc_issue, - .irq_on = ata_irq_on, .freeze = adma_freeze, .thaw = adma_thaw, .prereset = adma_prereset, - .softreset = ata_std_softreset, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, .port_start = adma_port_start, .port_stop = adma_port_stop,