ide: remove write-only ->sata_misc[] from ide_hwif_t

* Remove write-only ->sata_misc[] from ide_hwif_t.

* Remove no longer used SATA_{MISC,PHY,IEN}_OFFSET defines.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 0 insertions, 8 deletions

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index ef5b39fa042b..cc4be9621bc0 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -704,9 +704,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
                 hwif->sata_scr[SATA_STATUS_OFFSET]      = base + 0x104;
                 hwif->sata_scr[SATA_ERROR_OFFSET]       = base + 0x108;
                 hwif->sata_scr[SATA_CONTROL_OFFSET]     = base + 0x100;
-                hwif->sata_misc[SATA_MISC_OFFSET]       = base + 0x140;
-                hwif->sata_misc[SATA_PHY_OFFSET]        = base + 0x144;
-                hwif->sata_misc[SATA_IEN_OFFSET]        = base + 0x148;
         }
 
         memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ad75e703d14b..e02fd111a7ea 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -115,10 +115,6 @@ typedef unsigned char	byte;	/* used everywhere */
 #define SATA_ERROR_OFFSET       (1)
 #define SATA_CONTROL_OFFSET     (2)
 
-#define SATA_MISC_OFFSET        (0)
-#define SATA_PHY_OFFSET         (1)
-#define SATA_IEN_OFFSET         (2)
-
 /*
  * Our Physical Region Descriptor (PRD) table should be large enough
  * to handle the biggest I/O request we are likely to see.  Since requests
@@ -473,7 +469,6 @@ typedef struct hwif_s {
                 /* task file registers for pata and sata */
         unsigned long   io_ports[IDE_NR_PORTS];
         unsigned long   sata_scr[SATA_NR_PORTS];
-        unsigned long   sata_misc[SATA_NR_PORTS];
 
         ide_drive_t     drives[MAX_DRIVES];     /* drive info */