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
nexedi
linux
Commits
4661fb3f
Commit
4661fb3f
authored
19 years ago
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Don't use host->irq
Signed-off-by:
Russell King
<
rmk@arm.linux.org.uk
>
parent
ce39ffcd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
21 deletions
+17
-21
drivers/scsi/arm/arxescsi.c
drivers/scsi/arm/arxescsi.c
+1
-2
drivers/scsi/arm/cumana_2.c
drivers/scsi/arm/cumana_2.c
+5
-6
drivers/scsi/arm/eesox.c
drivers/scsi/arm/eesox.c
+5
-6
drivers/scsi/arm/fas216.c
drivers/scsi/arm/fas216.c
+1
-1
drivers/scsi/arm/powertec.c
drivers/scsi/arm/powertec.c
+5
-6
No files found.
drivers/scsi/arm/arxescsi.c
View file @
4661fb3f
...
...
@@ -306,7 +306,6 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
}
host
->
base
=
(
unsigned
long
)
base
;
host
->
irq
=
NO_IRQ
;
host
->
dma_channel
=
NO_DMA
;
info
=
(
struct
arxescsi_info
*
)
host
->
hostdata
;
...
...
@@ -314,7 +313,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
info
->
base
=
base
;
info
->
info
.
scsi
.
io_base
=
base
+
0x2000
;
info
->
info
.
scsi
.
irq
=
host
->
irq
;
info
->
info
.
scsi
.
irq
=
NO_IRQ
;
info
->
info
.
scsi
.
io_shift
=
5
;
info
->
info
.
ifcfg
.
clockrate
=
24
;
/* MHz */
info
->
info
.
ifcfg
.
select_timeout
=
255
;
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/arm/cumana_2.c
View file @
4661fb3f
...
...
@@ -428,7 +428,6 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
}
host
->
base
=
(
unsigned
long
)
base
;
host
->
irq
=
ec
->
irq
;
host
->
dma_channel
=
ec
->
dma
;
ecard_set_drvdata
(
ec
,
host
);
...
...
@@ -441,7 +440,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
info
->
info
.
scsi
.
io_base
=
base
+
CUMANASCSI2_FAS216_OFFSET
;
info
->
info
.
scsi
.
io_shift
=
CUMANASCSI2_FAS216_SHIFT
;
info
->
info
.
scsi
.
irq
=
host
->
irq
;
info
->
info
.
scsi
.
irq
=
ec
->
irq
;
info
->
info
.
ifcfg
.
clockrate
=
40
;
/* MHz */
info
->
info
.
ifcfg
.
select_timeout
=
255
;
info
->
info
.
ifcfg
.
asyncperiod
=
200
;
/* ns */
...
...
@@ -463,11 +462,11 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
ret
)
goto
out_free
;
ret
=
request_irq
(
host
->
irq
,
cumanascsi_2_intr
,
ret
=
request_irq
(
ec
->
irq
,
cumanascsi_2_intr
,
SA_INTERRUPT
,
"cumanascsi2"
,
info
);
if
(
ret
)
{
printk
(
"scsi%d: IRQ%d not free: %d
\n
"
,
host
->
host_no
,
host
->
irq
,
ret
);
host
->
host_no
,
ec
->
irq
,
ret
);
goto
out_release
;
}
...
...
@@ -488,7 +487,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
host
);
free_irq
(
ec
->
irq
,
host
);
out_release:
fas216_release
(
host
);
...
...
@@ -516,7 +515,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
info
);
free_irq
(
ec
->
irq
,
info
);
iounmap
(
info
->
base
);
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/arm/eesox.c
View file @
4661fb3f
...
...
@@ -545,7 +545,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
}
host
->
base
=
(
unsigned
long
)
base
;
host
->
irq
=
ec
->
irq
;
host
->
dma_channel
=
ec
->
dma
;
ecard_set_drvdata
(
ec
,
host
);
...
...
@@ -559,7 +558,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
info
->
info
.
scsi
.
io_base
=
base
+
EESOX_FAS216_OFFSET
;
info
->
info
.
scsi
.
io_shift
=
EESOX_FAS216_SHIFT
;
info
->
info
.
scsi
.
irq
=
host
->
irq
;
info
->
info
.
scsi
.
irq
=
ec
->
irq
;
info
->
info
.
ifcfg
.
clockrate
=
40
;
/* MHz */
info
->
info
.
ifcfg
.
select_timeout
=
255
;
info
->
info
.
ifcfg
.
asyncperiod
=
200
;
/* ns */
...
...
@@ -583,10 +582,10 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
ret
)
goto
out_free
;
ret
=
request_irq
(
host
->
irq
,
eesoxscsi_intr
,
0
,
"eesoxscsi"
,
info
);
ret
=
request_irq
(
ec
->
irq
,
eesoxscsi_intr
,
0
,
"eesoxscsi"
,
info
);
if
(
ret
)
{
printk
(
"scsi%d: IRQ%d not free: %d
\n
"
,
host
->
host_no
,
host
->
irq
,
ret
);
host
->
host_no
,
ec
->
irq
,
ret
);
goto
out_remove
;
}
...
...
@@ -608,7 +607,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
host
);
free_irq
(
ec
->
irq
,
host
);
out_remove:
fas216_remove
(
host
);
...
...
@@ -637,7 +636,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
info
);
free_irq
(
ec
->
irq
,
info
);
device_remove_file
(
&
ec
->
dev
,
&
dev_attr_bus_term
);
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/arm/fas216.c
View file @
4661fb3f
...
...
@@ -2971,7 +2971,7 @@ int fas216_print_host(FAS216_Info *info, char *buffer)
" IRQ : %d
\n
"
" DMA : %d
\n
"
,
info
->
scsi
.
type
,
info
->
host
->
io_port
,
info
->
host
->
irq
,
info
->
host
->
dma_channel
);
info
->
scsi
.
irq
,
info
->
host
->
dma_channel
);
}
int
fas216_print_stats
(
FAS216_Info
*
info
,
char
*
buffer
)
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/arm/powertec.c
View file @
4661fb3f
...
...
@@ -340,7 +340,6 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
}
host
->
base
=
(
unsigned
long
)
base
;
host
->
irq
=
ec
->
irq
;
host
->
dma_channel
=
ec
->
dma
;
ecard_set_drvdata
(
ec
,
host
);
...
...
@@ -351,7 +350,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
info
->
info
.
scsi
.
io_base
=
base
+
POWERTEC_FAS216_OFFSET
;
info
->
info
.
scsi
.
io_shift
=
POWERTEC_FAS216_SHIFT
;
info
->
info
.
scsi
.
irq
=
host
->
irq
;
info
->
info
.
scsi
.
irq
=
ec
->
irq
;
info
->
info
.
ifcfg
.
clockrate
=
40
;
/* MHz */
info
->
info
.
ifcfg
.
select_timeout
=
255
;
info
->
info
.
ifcfg
.
asyncperiod
=
200
;
/* ns */
...
...
@@ -375,11 +374,11 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
ret
)
goto
out_free
;
ret
=
request_irq
(
host
->
irq
,
powertecscsi_intr
,
ret
=
request_irq
(
ec
->
irq
,
powertecscsi_intr
,
SA_INTERRUPT
,
"powertec"
,
info
);
if
(
ret
)
{
printk
(
"scsi%d: IRQ%d not free: %d
\n
"
,
host
->
host_no
,
host
->
irq
,
ret
);
host
->
host_no
,
ec
->
irq
,
ret
);
goto
out_release
;
}
...
...
@@ -400,7 +399,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
host
);
free_irq
(
ec
->
irq
,
host
);
out_release:
fas216_release
(
host
);
...
...
@@ -431,7 +430,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
if
(
host
->
dma_channel
!=
NO_DMA
)
free_dma
(
host
->
dma_channel
);
free_irq
(
host
->
irq
,
info
);
free_irq
(
ec
->
irq
,
info
);
iounmap
(
info
->
base
);
...
...
This diff is collapsed.
Click to expand it.
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