Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9319e75f
Commit
9319e75f
authored
Mar 16, 2004
by
Bartlomiej Zolnierkiewicz
Committed by
Linus Torvalds
Mar 16, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] remove ide_hwif_t->initializing
It's write-only these days.
parent
fbbefbb8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
12 deletions
+0
-12
drivers/ide/ide-probe.c
drivers/ide/ide-probe.c
+0
-2
drivers/ide/ide.c
drivers/ide/ide.c
+0
-1
drivers/ide/pci/pdc202xx_new.c
drivers/ide/pci/pdc202xx_new.c
+0
-4
drivers/ide/pci/pdc202xx_old.c
drivers/ide/pci/pdc202xx_old.c
+0
-4
include/linux/ide.h
include/linux/ide.h
+0
-1
No files found.
drivers/ide/ide-probe.c
View file @
9319e75f
...
@@ -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
;
}
}
...
...
drivers/ide/ide.c
View file @
9319e75f
...
@@ -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
;
...
...
drivers/ide/pci/pdc202xx_new.c
View file @
9319e75f
...
@@ -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
);
...
...
drivers/ide/pci/pdc202xx_old.c
View file @
9319e75f
...
@@ -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
);
...
...
include/linux/ide.h
View file @
9319e75f
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment