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
07bc1c68
Commit
07bc1c68
authored
Aug 16, 2003
by
James Bottomley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove generic device name field from parisc SCSI devices
zalon and lasi700 still use this; replace it with bus_id.
parent
44b4ad44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
drivers/scsi/lasi700.c
drivers/scsi/lasi700.c
+3
-7
drivers/scsi/zalon.c
drivers/scsi/zalon.c
+2
-4
No files found.
drivers/scsi/lasi700.c
View file @
07bc1c68
...
@@ -86,14 +86,10 @@ lasi700_driver_callback(struct parisc_device *dev)
...
@@ -86,14 +86,10 @@ lasi700_driver_callback(struct parisc_device *dev)
struct
NCR_700_Host_Parameters
*
hostdata
;
struct
NCR_700_Host_Parameters
*
hostdata
;
struct
Scsi_Host
*
host
;
struct
Scsi_Host
*
host
;
snprintf
(
dev
->
dev
.
name
,
sizeof
(
dev
->
dev
.
name
),
"%s"
,
(
dev
->
id
.
sversion
==
LASI_700_SVERSION
)
?
"lasi700"
:
"lasi710"
);
hostdata
=
kmalloc
(
sizeof
(
*
hostdata
),
GFP_KERNEL
);
hostdata
=
kmalloc
(
sizeof
(
*
hostdata
),
GFP_KERNEL
);
if
(
!
hostdata
)
{
if
(
!
hostdata
)
{
printk
(
KERN_ERR
"%s: Failed to allocate host data
\n
"
,
printk
(
KERN_ERR
"%s: Failed to allocate host data
\n
"
,
dev
->
dev
.
name
);
dev
->
dev
.
bus_id
);
return
1
;
return
1
;
}
}
memset
(
hostdata
,
0
,
sizeof
(
struct
NCR_700_Host_Parameters
));
memset
(
hostdata
,
0
,
sizeof
(
struct
NCR_700_Host_Parameters
));
...
@@ -121,9 +117,9 @@ lasi700_driver_callback(struct parisc_device *dev)
...
@@ -121,9 +117,9 @@ lasi700_driver_callback(struct parisc_device *dev)
host
->
irq
=
dev
->
irq
;
host
->
irq
=
dev
->
irq
;
if
(
request_irq
(
dev
->
irq
,
NCR_700_intr
,
SA_SHIRQ
,
if
(
request_irq
(
dev
->
irq
,
NCR_700_intr
,
SA_SHIRQ
,
dev
->
dev
.
name
,
host
))
{
dev
->
dev
.
bus_id
,
host
))
{
printk
(
KERN_ERR
"%s: irq problem, detaching
\n
"
,
printk
(
KERN_ERR
"%s: irq problem, detaching
\n
"
,
dev
->
dev
.
name
);
dev
->
dev
.
bus_id
);
goto
out_put_host
;
goto
out_put_host
;
}
}
...
...
drivers/scsi/zalon.c
View file @
07bc1c68
...
@@ -135,11 +135,9 @@ zalon_scsi_callback(struct parisc_device *dev)
...
@@ -135,11 +135,9 @@ zalon_scsi_callback(struct parisc_device *dev)
if
(
!
host
)
if
(
!
host
)
goto
fail
;
goto
fail
;
strlcpy
(
dev
->
dev
.
name
,
"zalon7xx"
,
sizeof
(
dev
->
dev
.
name
));
if
(
request_irq
(
irq
,
ncr53c8xx_intr
,
SA_SHIRQ
,
dev
->
dev
.
bus_id
,
host
))
{
if
(
request_irq
(
irq
,
ncr53c8xx_intr
,
SA_SHIRQ
,
dev
->
dev
.
name
,
host
))
{
printk
(
KERN_ERR
"%s: irq problem with %d, detaching
\n
"
,
printk
(
KERN_ERR
"%s: irq problem with %d, detaching
\n
"
,
dev
->
dev
.
name
,
irq
);
dev
->
dev
.
bus_id
,
irq
);
goto
fail
;
goto
fail
;
}
}
...
...
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