1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index f12c2b6ac08..bec1de594de 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -145,32 +145,32 @@ static struct scsi_host_template adma_ata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
+        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
+        .bios_param             = ata_std_bios_param,
+        .proc_name              = DRV_NAME,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
+        .dma_boundary           = ADMA_DMA_BOUNDARY,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
-        .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = ENABLE_CLUSTERING,
-        .proc_name              = DRV_NAME,
-        .dma_boundary           = ADMA_DMA_BOUNDARY,
-        .slave_configure        = ata_scsi_slave_config,
-        .slave_destroy          = ata_scsi_slave_destroy,
-        .bios_param             = ata_std_bios_param,
+        .emulated               = ATA_SHT_EMULATED,
 };
 
 static const struct ata_port_operations adma_ata_ops = {
         .port_disable           = ata_port_disable,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
-        .check_status           = ata_check_status,
-        .check_atapi_dma        = adma_check_atapi_dma,
         .exec_command           = ata_exec_command,
+        .check_status           = ata_check_status,
         .dev_select             = ata_std_dev_select,
         .phy_reset              = adma_phy_reset,
+        .check_atapi_dma        = adma_check_atapi_dma,
+        .data_xfer              = ata_data_xfer,
         .qc_prep                = adma_qc_prep,
         .qc_issue               = adma_qc_issue,
         .eng_timeout            = adma_eng_timeout,
-        .data_xfer              = ata_data_xfer,
         .irq_clear              = adma_irq_clear,
         .irq_on                 = ata_irq_on,
         .irq_ack                = ata_irq_ack,
@@ -188,7 +188,7 @@ static struct ata_port_info adma_port_info[] = {
                                   ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
                                   ATA_FLAG_PIO_POLLING,
                 .pio_mask       = 0x10, /* pio4 */
-                .udma_mask      = 0x1f, /* udma0-4 */
+                .udma_mask      = ATA_UDMA4,
                 .port_ops       = &adma_ata_ops,
         },
 };