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
01d08aa9
Commit
01d08aa9
authored
Sep 10, 2004
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] avoid obsolete APIs in ide-scsi
Signed-off-by:
James Bottomley
<
James.Bottomley@SteelEye.com
>
parent
fcba8b41
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
drivers/scsi/ide-scsi.c
drivers/scsi/ide-scsi.c
+14
-10
No files found.
drivers/scsi/ide-scsi.c
View file @
01d08aa9
...
...
@@ -50,8 +50,11 @@
#include <asm/bitops.h>
#include <asm/uaccess.h>
#include "scsi.h"
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
#include <scsi/sg.h>
#define IDESCSI_DEBUG_LOG 0
...
...
@@ -66,8 +69,8 @@ typedef struct idescsi_pc_s {
u8
*
current_position
;
/* Pointer into the above buffer */
struct
scatterlist
*
sg
;
/* Scatter gather table */
int
b_count
;
/* Bytes transferred from current entry */
Scsi_Cmnd
*
scsi_cmd
;
/* SCSI command */
void
(
*
done
)(
Scsi_Cmnd
*
);
/* Scsi completion routine */
struct
scsi_cmnd
*
scsi_cmd
;
/* SCSI command */
void
(
*
done
)(
struct
scsi_cmnd
*
);
/* Scsi completion routine */
unsigned
long
flags
;
/* Status/Action flags */
unsigned
long
timeout
;
/* Command timeout */
}
idescsi_pc_t
;
...
...
@@ -747,7 +750,7 @@ static struct block_device_operations idescsi_ops = {
static
int
idescsi_attach
(
ide_drive_t
*
drive
);
static
int
idescsi_slave_configure
(
Scsi_D
evice
*
sdp
)
static
int
idescsi_slave_configure
(
struct
scsi_d
evice
*
sdp
)
{
/* Configure detected device */
scsi_adjust_queue_depth
(
sdp
,
MSG_SIMPLE_TAG
,
sdp
->
host
->
cmd_per_lun
);
...
...
@@ -759,7 +762,7 @@ static const char *idescsi_info (struct Scsi_Host *host)
return
"SCSI host adapter emulation for IDE ATAPI devices"
;
}
static
int
idescsi_ioctl
(
Scsi_D
evice
*
dev
,
int
cmd
,
void
__user
*
arg
)
static
int
idescsi_ioctl
(
struct
scsi_d
evice
*
dev
,
int
cmd
,
void
__user
*
arg
)
{
idescsi_scsi_t
*
scsi
=
scsihost_to_idescsi
(
dev
->
host
);
...
...
@@ -849,7 +852,7 @@ static inline struct bio *idescsi_dma_bio(ide_drive_t *drive, idescsi_pc_t *pc)
return
first_bh
;
}
static
inline
int
should_transform
(
ide_drive_t
*
drive
,
Scsi_C
mnd
*
cmd
)
static
inline
int
should_transform
(
ide_drive_t
*
drive
,
struct
scsi_c
mnd
*
cmd
)
{
idescsi_scsi_t
*
scsi
=
drive_to_idescsi
(
drive
);
...
...
@@ -867,7 +870,8 @@ static inline int should_transform(ide_drive_t *drive, Scsi_Cmnd *cmd)
return
test_bit
(
IDESCSI_TRANSFORM
,
&
scsi
->
transform
);
}
static
int
idescsi_queue
(
Scsi_Cmnd
*
cmd
,
void
(
*
done
)(
Scsi_Cmnd
*
))
static
int
idescsi_queue
(
struct
scsi_cmnd
*
cmd
,
void
(
*
done
)(
struct
scsi_cmnd
*
))
{
struct
Scsi_Host
*
host
=
cmd
->
device
->
host
;
idescsi_scsi_t
*
scsi
=
scsihost_to_idescsi
(
host
);
...
...
@@ -933,7 +937,7 @@ static int idescsi_queue (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
return
1
;
}
static
int
idescsi_eh_abort
(
Scsi_C
mnd
*
cmd
)
static
int
idescsi_eh_abort
(
struct
scsi_c
mnd
*
cmd
)
{
idescsi_scsi_t
*
scsi
=
scsihost_to_idescsi
(
cmd
->
device
->
host
);
ide_drive_t
*
drive
=
scsi
->
drive
;
...
...
@@ -992,7 +996,7 @@ static int idescsi_eh_abort (Scsi_Cmnd *cmd)
return
ret
;
}
static
int
idescsi_eh_reset
(
Scsi_C
mnd
*
cmd
)
static
int
idescsi_eh_reset
(
struct
scsi_c
mnd
*
cmd
)
{
struct
request
*
req
;
idescsi_scsi_t
*
scsi
=
scsihost_to_idescsi
(
cmd
->
device
->
host
);
...
...
@@ -1075,7 +1079,7 @@ static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev,
return
0
;
}
static
Scsi_Host_T
emplate
idescsi_template
=
{
static
struct
scsi_host_t
emplate
idescsi_template
=
{
.
module
=
THIS_MODULE
,
.
name
=
"idescsi"
,
.
info
=
idescsi_info
,
...
...
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