projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: unify request timeout handling
[deliverable/linux.git]
/
drivers
/
scsi
/
ncr53c8xx.c
diff --git
a/drivers/scsi/ncr53c8xx.c
b/drivers/scsi/ncr53c8xx.c
index c5ebf018b378fc3d026b3bb02eda29f8731be27a..3b7240e40819cb98a0024f031b964e306f17f990 100644
(file)
--- a/
drivers/scsi/ncr53c8xx.c
+++ b/
drivers/scsi/ncr53c8xx.c
@@
-4170,8
+4170,8
@@
static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
**
**----------------------------------------------------
*/
**
**----------------------------------------------------
*/
- if (np->settle_time && cmd->
timeout_per_command
>= HZ) {
- u_long tlimit = jiffies + cmd->
timeout_per_command
- HZ;
+ if (np->settle_time && cmd->
request->timeout
>= HZ) {
+ u_long tlimit = jiffies + cmd->
request->timeout
- HZ;
if (time_after(np->settle_time, tlimit))
np->settle_time = tlimit;
}
if (time_after(np->settle_time, tlimit))
np->settle_time = tlimit;
}
@@
-8186,7
+8186,7
@@
static void insert_into_waiting_list(struct ncb *np, struct scsi_cmnd *cmd)
cmd->next_wcmd = NULL;
if (!(wcmd = np->waiting_list)) np->waiting_list = cmd;
else {
cmd->next_wcmd = NULL;
if (!(wcmd = np->waiting_list)) np->waiting_list = cmd;
else {
- while (
(wcmd->next_wcmd) != 0
)
+ while (
wcmd->next_wcmd
)
wcmd = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = (char *) cmd;
}
wcmd = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = (char *) cmd;
}
@@
-8222,7
+8222,7
@@
static void process_waiting_list(struct ncb *np, int sts)
#ifdef DEBUG_WAITING_LIST
if (waiting_list) printk("%s: waiting_list=%lx processing sts=%d\n", ncr_name(np), (u_long) waiting_list, sts);
#endif
#ifdef DEBUG_WAITING_LIST
if (waiting_list) printk("%s: waiting_list=%lx processing sts=%d\n", ncr_name(np), (u_long) waiting_list, sts);
#endif
- while ((wcmd = waiting_list) !=
0
) {
+ while ((wcmd = waiting_list) !=
NULL
) {
waiting_list = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = NULL;
if (sts == DID_OK) {
waiting_list = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = NULL;
if (sts == DID_OK) {
@@
-8243,7
+8243,8
@@
static void process_waiting_list(struct ncb *np, int sts)
#undef next_wcmd
#undef next_wcmd
-static ssize_t show_ncr53c8xx_revision(struct class_device *dev, char *buf)
+static ssize_t show_ncr53c8xx_revision(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
struct Scsi_Host *host = class_to_shost(dev);
struct host_data *host_data = (struct host_data *)host->hostdata;
{
struct Scsi_Host *host = class_to_shost(dev);
struct host_data *host_data = (struct host_data *)host->hostdata;
@@
-8251,12
+8252,12
@@
static ssize_t show_ncr53c8xx_revision(struct class_device *dev, char *buf)
return snprintf(buf, 20, "0x%x\n", host_data->ncb->revision_id);
}
return snprintf(buf, 20, "0x%x\n", host_data->ncb->revision_id);
}
-static struct
class_
device_attribute ncr53c8xx_revision_attr = {
+static struct device_attribute ncr53c8xx_revision_attr = {
.attr = { .name = "revision", .mode = S_IRUGO, },
.show = show_ncr53c8xx_revision,
};
.attr = { .name = "revision", .mode = S_IRUGO, },
.show = show_ncr53c8xx_revision,
};
-static struct
class_
device_attribute *ncr53c8xx_host_attrs[] = {
+static struct device_attribute *ncr53c8xx_host_attrs[] = {
&ncr53c8xx_revision_attr,
NULL
};
&ncr53c8xx_revision_attr,
NULL
};
This page took
0.028198 seconds
and
5
git commands to generate.