Merge branch 'master' into upstream

[linux-2.6] / drivers / scsi / sata_svw.c

diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 051e47d975ca3f0452fdeda1aee94664eef39eea..d9b516836486a468dbe3bdd1819ccf73fee9694f 100644 (file)
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -54,35 +54,37 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME       "sata_svw"
-#define DRV_VERSION    "1.07"
-
-/* Taskfile registers offsets */
-#define K2_SATA_TF_CMD_OFFSET          0x00
-#define K2_SATA_TF_DATA_OFFSET         0x00
-#define K2_SATA_TF_ERROR_OFFSET                0x04
-#define K2_SATA_TF_NSECT_OFFSET                0x08
-#define K2_SATA_TF_LBAL_OFFSET         0x0c
-#define K2_SATA_TF_LBAM_OFFSET         0x10
-#define K2_SATA_TF_LBAH_OFFSET         0x14
-#define K2_SATA_TF_DEVICE_OFFSET       0x18
-#define K2_SATA_TF_CMDSTAT_OFFSET              0x1c
-#define K2_SATA_TF_CTL_OFFSET          0x20
-
-/* DMA base */
-#define K2_SATA_DMA_CMD_OFFSET         0x30
-
-/* SCRs base */
-#define K2_SATA_SCR_STATUS_OFFSET      0x40
-#define K2_SATA_SCR_ERROR_OFFSET       0x44
-#define K2_SATA_SCR_CONTROL_OFFSET     0x48
-
-/* Others */
-#define K2_SATA_SICR1_OFFSET           0x80
-#define K2_SATA_SICR2_OFFSET           0x84
-#define K2_SATA_SIM_OFFSET             0x88
-
-/* Port stride */
-#define K2_SATA_PORT_OFFSET            0x100
+#define DRV_VERSION    "1.8"
+
+enum {
+       /* Taskfile registers offsets */
+       K2_SATA_TF_CMD_OFFSET           = 0x00,
+       K2_SATA_TF_DATA_OFFSET          = 0x00,
+       K2_SATA_TF_ERROR_OFFSET         = 0x04,
+       K2_SATA_TF_NSECT_OFFSET         = 0x08,
+       K2_SATA_TF_LBAL_OFFSET          = 0x0c,
+       K2_SATA_TF_LBAM_OFFSET          = 0x10,
+       K2_SATA_TF_LBAH_OFFSET          = 0x14,
+       K2_SATA_TF_DEVICE_OFFSET        = 0x18,
+       K2_SATA_TF_CMDSTAT_OFFSET       = 0x1c,
+       K2_SATA_TF_CTL_OFFSET           = 0x20,
+
+       /* DMA base */
+       K2_SATA_DMA_CMD_OFFSET          = 0x30,
+
+       /* SCRs base */
+       K2_SATA_SCR_STATUS_OFFSET       = 0x40,
+       K2_SATA_SCR_ERROR_OFFSET        = 0x44,
+       K2_SATA_SCR_CONTROL_OFFSET      = 0x48,
+
+       /* Others */
+       K2_SATA_SICR1_OFFSET            = 0x80,
+       K2_SATA_SICR2_OFFSET            = 0x84,
+       K2_SATA_SIM_OFFSET              = 0x88,
+
+       /* Port stride */
+       K2_SATA_PORT_OFFSET             = 0x100,
+};
 
 static u8 k2_stat_check_status(struct ata_port *ap);
 
@@ -255,7 +257,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
        int len, index;
 
        /* Find  the ata_port */
-       ap = (struct ata_port *) &shost->hostdata[0];
+       ap = ata_shost_to_port(shost);
        if (ap == NULL)
                return 0;
 
@@ -288,7 +290,6 @@ static struct scsi_host_template k2_sata_sht = {
        .name                   = DRV_NAME,
        .ioctl                  = ata_scsi_ioctl,
        .queuecommand           = ata_scsi_queuecmd,
-       .eh_strategy_handler    = ata_scsi_error,
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
@@ -298,6 +299,7 @@ static struct scsi_host_template k2_sata_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+       .slave_destroy          = ata_scsi_slave_destroy,
 #ifdef CONFIG_PPC_OF
        .proc_info              = k2_sata_proc_info,
 #endif
@@ -319,6 +321,7 @@ static const struct ata_port_operations k2_sata_ops = {
        .bmdma_status           = ata_bmdma_status,
        .qc_prep                = ata_qc_prep,
        .qc_issue               = ata_qc_issue_prot,
+       .data_xfer              = ata_mmio_data_xfer,
        .eng_timeout            = ata_eng_timeout,
        .irq_handler            = ata_interrupt,
        .irq_clear              = ata_bmdma_irq_clear,