[PATCH] remove ide_hwif_t->initializing

It's write-only these days.

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f13b928d2e37fdd9a0ec60056414864370ee8dca..0dab816b4db45fb13f3ddc82b43140a7094e87b2 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -844,7 +844,6 @@ EXPORT_SYMBOL(probe_hwif);
 int hwif_init (ide_hwif_t *hwif);
 int probe_hwif_init (ide_hwif_t *hwif)
 {
-       hwif->initializing = 1;
        probe_hwif(hwif);
        hwif_init(hwif);
 
@@ -860,7 +859,6 @@ int probe_hwif_init (ide_hwif_t *hwif)
                        }
                }
        }
-       hwif->initializing = 0;
        return 0;
 }
 

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index f03a6b910591f56027fa297b7dd28399cb489607..e04003ad9d67ec3e461448e3bfc021a90cdc4efe 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -869,7 +869,6 @@ void ide_unregister (unsigned int index)
 #ifndef CONFIG_BLK_DEV_IDECS
        hwif->irq                       = old_hwif.irq;
 #endif /* CONFIG_BLK_DEV_IDECS */
-       hwif->initializing              = old_hwif.initializing;
 
        hwif->dma_base                  = old_hwif.dma_base;
        hwif->dma_master                = old_hwif.dma_master;

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index f905a5bd3c7e147283f04e6370f672c501ecb382..3c00a0c813d819a787342d38c773b9d9479cee44 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -339,7 +339,6 @@ void pdcnew_reset (ide_drive_t *drive)
         */
        if (hwif->present) {
                u16 hunit = 0;
-               hwif->initializing = 1;
                for (hunit = 0; hunit < MAX_DRIVES; ++hunit) {
                        ide_drive_t *hdrive = &hwif->drives[hunit];
                        if (hdrive->present) {
@@ -349,11 +348,9 @@ void pdcnew_reset (ide_drive_t *drive)
                                        hwif->tuneproc(hdrive, 5);
                        }
                }
-               hwif->initializing = 0;
        }
        if (mate->present) {
                u16 munit = 0;
-               mate->initializing = 1;
                for (munit = 0; munit < MAX_DRIVES; ++munit) {
                        ide_drive_t *mdrive = &mate->drives[munit];
                        if (mdrive->present) {
@@ -363,7 +360,6 @@ void pdcnew_reset (ide_drive_t *drive)
                                        mate->tuneproc(mdrive, 5);
                        }
                }
-               mate->initializing = 0;
        }
 #else
        hwif->tuneproc(drive, 5);

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 5a664f89b97589ab50f05544e61a3a6caee01ba0..00012d78e218ce796ac67bf26633c730085b9c99 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -618,7 +618,6 @@ void pdc202xx_reset (ide_drive_t *drive)
         */
        if (hwif->present) {
                u16 hunit = 0;
-               hwif->initializing = 1;
                for (hunit = 0; hunit < MAX_DRIVES; ++hunit) {
                        ide_drive_t *hdrive = &hwif->drives[hunit];
                        if (hdrive->present) {
@@ -628,11 +627,9 @@ void pdc202xx_reset (ide_drive_t *drive)
                                        hwif->tuneproc(hdrive, 5);
                        }
                }
-               hwif->initializing = 0;
        }
        if (mate->present) {
                u16 munit = 0;
-               mate->initializing = 1;
                for (munit = 0; munit < MAX_DRIVES; ++munit) {
                        ide_drive_t *mdrive = &mate->drives[munit];
                        if (mdrive->present) {
@@ -642,7 +639,6 @@ void pdc202xx_reset (ide_drive_t *drive)
                                        mate->tuneproc(mdrive, 5);
                        }
                }
-               mate->initializing = 0;
        }
 #else
        hwif->tuneproc(drive, 5);

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2ff35579ebb3455285ce2e971f929683d261c98a..90c90d8aa42aa1bc418990081f288cd154bbeb47 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -935,7 +935,6 @@ typedef struct hwif_s {
        int             mmio;           /* hosts iomio (0), mmio (1) or custom (2) select */
        int             rqsize;         /* max sectors per request */
        int             irq;            /* our irq number */
-       int             initializing;   /* set while initializing self */
 
        unsigned long   dma_master;     /* reference base addr dmabase */
        unsigned long   dma_base;       /* base addr for dma ports */