diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/scsi.h | 4 | ||||
-rw-r--r-- | include/scsi/scsi_cmnd.h | 5 | ||||
-rw-r--r-- | include/scsi/scsi_device.h | 3 | ||||
-rw-r--r-- | include/scsi/scsi_host.h | 6 |
4 files changed, 4 insertions, 14 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 1fb233741513..b361172b576c 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h | |||
@@ -28,7 +28,7 @@ extern const unsigned char scsi_command_size[8]; | |||
28 | * SCSI device types | 28 | * SCSI device types |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #define MAX_SCSI_DEVICE_CODE 14 | 31 | #define MAX_SCSI_DEVICE_CODE 15 |
32 | extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; | 32 | extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; |
33 | 33 | ||
34 | /* | 34 | /* |
@@ -211,8 +211,8 @@ static inline int scsi_status_is_good(int status) | |||
211 | * - treated as TYPE_DISK */ | 211 | * - treated as TYPE_DISK */ |
212 | #define TYPE_MEDIUM_CHANGER 0x08 | 212 | #define TYPE_MEDIUM_CHANGER 0x08 |
213 | #define TYPE_COMM 0x09 /* Communications device */ | 213 | #define TYPE_COMM 0x09 /* Communications device */ |
214 | #define TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ | ||
215 | #define TYPE_RAID 0x0c | 214 | #define TYPE_RAID 0x0c |
215 | #define TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ | ||
216 | #define TYPE_RBC 0x0e | 216 | #define TYPE_RBC 0x0e |
217 | #define TYPE_NO_LUN 0x7f | 217 | #define TYPE_NO_LUN 0x7f |
218 | 218 | ||
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 07f5c699eaa7..9957f16dcc5d 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h | |||
@@ -31,14 +31,11 @@ struct scsi_cmnd { | |||
31 | int sc_magic; | 31 | int sc_magic; |
32 | 32 | ||
33 | struct scsi_device *device; | 33 | struct scsi_device *device; |
34 | unsigned short state; | ||
35 | unsigned short owner; | ||
36 | struct scsi_request *sc_request; | 34 | struct scsi_request *sc_request; |
37 | 35 | ||
38 | struct list_head list; /* scsi_cmnd participates in queue lists */ | 36 | struct list_head list; /* scsi_cmnd participates in queue lists */ |
39 | 37 | ||
40 | struct list_head eh_entry; /* entry for the host eh_cmd_q */ | 38 | struct list_head eh_entry; /* entry for the host eh_cmd_q */ |
41 | int eh_state; /* Used for state tracking in error handlr */ | ||
42 | int eh_eflags; /* Used by error handlr */ | 39 | int eh_eflags; /* Used by error handlr */ |
43 | void (*done) (struct scsi_cmnd *); /* Mid-level done function */ | 40 | void (*done) (struct scsi_cmnd *); /* Mid-level done function */ |
44 | 41 | ||
@@ -80,8 +77,6 @@ struct scsi_cmnd { | |||
80 | * sense info */ | 77 | * sense info */ |
81 | unsigned short use_sg; /* Number of pieces of scatter-gather */ | 78 | unsigned short use_sg; /* Number of pieces of scatter-gather */ |
82 | unsigned short sglist_len; /* size of malloc'd scatter-gather list */ | 79 | unsigned short sglist_len; /* size of malloc'd scatter-gather list */ |
83 | unsigned short abort_reason; /* If the mid-level code requests an | ||
84 | * abort, this is the reason. */ | ||
85 | unsigned bufflen; /* Size of data buffer */ | 80 | unsigned bufflen; /* Size of data buffer */ |
86 | void *buffer; /* Data buffer */ | 81 | void *buffer; /* Data buffer */ |
87 | 82 | ||
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 63c91dd85ca1..835af8ecbb7c 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
@@ -9,7 +9,7 @@ | |||
9 | struct request_queue; | 9 | struct request_queue; |
10 | struct scsi_cmnd; | 10 | struct scsi_cmnd; |
11 | struct scsi_mode_data; | 11 | struct scsi_mode_data; |
12 | 12 | struct scsi_lun; | |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * sdev state: If you alter this, you also need to alter scsi_sysfs.c | 15 | * sdev state: If you alter this, you also need to alter scsi_sysfs.c |
@@ -243,6 +243,7 @@ extern void scsi_target_reap(struct scsi_target *); | |||
243 | extern void scsi_target_block(struct device *); | 243 | extern void scsi_target_block(struct device *); |
244 | extern void scsi_target_unblock(struct device *); | 244 | extern void scsi_target_unblock(struct device *); |
245 | extern void scsi_remove_target(struct device *); | 245 | extern void scsi_remove_target(struct device *); |
246 | extern void int_to_scsilun(unsigned int, struct scsi_lun *); | ||
246 | extern const char *scsi_device_state_name(enum scsi_device_state); | 247 | extern const char *scsi_device_state_name(enum scsi_device_state); |
247 | extern int scsi_is_sdev_device(const struct device *); | 248 | extern int scsi_is_sdev_device(const struct device *); |
248 | extern int scsi_is_target_device(const struct device *); | 249 | extern int scsi_is_target_device(const struct device *); |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index db9914adeac9..81d5234f6771 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -641,12 +641,6 @@ static inline void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock) | |||
641 | shost->host_lock = lock; | 641 | shost->host_lock = lock; |
642 | } | 642 | } |
643 | 643 | ||
644 | static inline void scsi_set_device(struct Scsi_Host *shost, | ||
645 | struct device *dev) | ||
646 | { | ||
647 | shost->shost_gendev.parent = dev; | ||
648 | } | ||
649 | |||
650 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) | 644 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) |
651 | { | 645 | { |
652 | return shost->shost_gendev.parent; | 646 | return shost->shost_gendev.parent; |