Commit 9319e75f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] remove ide_hwif_t->initializing

It's write-only these days.
parent fbbefbb8
...@@ -844,7 +844,6 @@ EXPORT_SYMBOL(probe_hwif); ...@@ -844,7 +844,6 @@ EXPORT_SYMBOL(probe_hwif);
int hwif_init (ide_hwif_t *hwif); int hwif_init (ide_hwif_t *hwif);
int probe_hwif_init (ide_hwif_t *hwif) int probe_hwif_init (ide_hwif_t *hwif)
{ {
hwif->initializing = 1;
probe_hwif(hwif); probe_hwif(hwif);
hwif_init(hwif); hwif_init(hwif);
...@@ -860,7 +859,6 @@ int probe_hwif_init (ide_hwif_t *hwif) ...@@ -860,7 +859,6 @@ int probe_hwif_init (ide_hwif_t *hwif)
} }
} }
} }
hwif->initializing = 0;
return 0; return 0;
} }
......
...@@ -869,7 +869,6 @@ void ide_unregister (unsigned int index) ...@@ -869,7 +869,6 @@ void ide_unregister (unsigned int index)
#ifndef CONFIG_BLK_DEV_IDECS #ifndef CONFIG_BLK_DEV_IDECS
hwif->irq = old_hwif.irq; hwif->irq = old_hwif.irq;
#endif /* CONFIG_BLK_DEV_IDECS */ #endif /* CONFIG_BLK_DEV_IDECS */
hwif->initializing = old_hwif.initializing;
hwif->dma_base = old_hwif.dma_base; hwif->dma_base = old_hwif.dma_base;
hwif->dma_master = old_hwif.dma_master; hwif->dma_master = old_hwif.dma_master;
......
...@@ -339,7 +339,6 @@ void pdcnew_reset (ide_drive_t *drive) ...@@ -339,7 +339,6 @@ void pdcnew_reset (ide_drive_t *drive)
*/ */
if (hwif->present) { if (hwif->present) {
u16 hunit = 0; u16 hunit = 0;
hwif->initializing = 1;
for (hunit = 0; hunit < MAX_DRIVES; ++hunit) { for (hunit = 0; hunit < MAX_DRIVES; ++hunit) {
ide_drive_t *hdrive = &hwif->drives[hunit]; ide_drive_t *hdrive = &hwif->drives[hunit];
if (hdrive->present) { if (hdrive->present) {
...@@ -349,11 +348,9 @@ void pdcnew_reset (ide_drive_t *drive) ...@@ -349,11 +348,9 @@ void pdcnew_reset (ide_drive_t *drive)
hwif->tuneproc(hdrive, 5); hwif->tuneproc(hdrive, 5);
} }
} }
hwif->initializing = 0;
} }
if (mate->present) { if (mate->present) {
u16 munit = 0; u16 munit = 0;
mate->initializing = 1;
for (munit = 0; munit < MAX_DRIVES; ++munit) { for (munit = 0; munit < MAX_DRIVES; ++munit) {
ide_drive_t *mdrive = &mate->drives[munit]; ide_drive_t *mdrive = &mate->drives[munit];
if (mdrive->present) { if (mdrive->present) {
...@@ -363,7 +360,6 @@ void pdcnew_reset (ide_drive_t *drive) ...@@ -363,7 +360,6 @@ void pdcnew_reset (ide_drive_t *drive)
mate->tuneproc(mdrive, 5); mate->tuneproc(mdrive, 5);
} }
} }
mate->initializing = 0;
} }
#else #else
hwif->tuneproc(drive, 5); hwif->tuneproc(drive, 5);
......
...@@ -618,7 +618,6 @@ void pdc202xx_reset (ide_drive_t *drive) ...@@ -618,7 +618,6 @@ void pdc202xx_reset (ide_drive_t *drive)
*/ */
if (hwif->present) { if (hwif->present) {
u16 hunit = 0; u16 hunit = 0;
hwif->initializing = 1;
for (hunit = 0; hunit < MAX_DRIVES; ++hunit) { for (hunit = 0; hunit < MAX_DRIVES; ++hunit) {
ide_drive_t *hdrive = &hwif->drives[hunit]; ide_drive_t *hdrive = &hwif->drives[hunit];
if (hdrive->present) { if (hdrive->present) {
...@@ -628,11 +627,9 @@ void pdc202xx_reset (ide_drive_t *drive) ...@@ -628,11 +627,9 @@ void pdc202xx_reset (ide_drive_t *drive)
hwif->tuneproc(hdrive, 5); hwif->tuneproc(hdrive, 5);
} }
} }
hwif->initializing = 0;
} }
if (mate->present) { if (mate->present) {
u16 munit = 0; u16 munit = 0;
mate->initializing = 1;
for (munit = 0; munit < MAX_DRIVES; ++munit) { for (munit = 0; munit < MAX_DRIVES; ++munit) {
ide_drive_t *mdrive = &mate->drives[munit]; ide_drive_t *mdrive = &mate->drives[munit];
if (mdrive->present) { if (mdrive->present) {
...@@ -642,7 +639,6 @@ void pdc202xx_reset (ide_drive_t *drive) ...@@ -642,7 +639,6 @@ void pdc202xx_reset (ide_drive_t *drive)
mate->tuneproc(mdrive, 5); mate->tuneproc(mdrive, 5);
} }
} }
mate->initializing = 0;
} }
#else #else
hwif->tuneproc(drive, 5); hwif->tuneproc(drive, 5);
......
...@@ -935,7 +935,6 @@ typedef struct hwif_s { ...@@ -935,7 +935,6 @@ typedef struct hwif_s {
int mmio; /* hosts iomio (0), mmio (1) or custom (2) select */ int mmio; /* hosts iomio (0), mmio (1) or custom (2) select */
int rqsize; /* max sectors per request */ int rqsize; /* max sectors per request */
int irq; /* our irq number */ int irq; /* our irq number */
int initializing; /* set while initializing self */
unsigned long dma_master; /* reference base addr dmabase */ unsigned long dma_master; /* reference base addr dmabase */
unsigned long dma_base; /* base addr for dma ports */ unsigned long dma_base; /* base addr for dma ports */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment