projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
scsi
/
scsi.c
diff --git
a/drivers/scsi/scsi.c
b/drivers/scsi/scsi.c
index
7a054f9
..
c59f315
100644
(file)
--- a/
drivers/scsi/scsi.c
+++ b/
drivers/scsi/scsi.c
@@
-128,7
+128,7
@@
const char * scsi_device_type(unsigned type)
return "Well-known LUN ";
if (type == 0x1f)
return "No Device ";
return "Well-known LUN ";
if (type == 0x1f)
return "No Device ";
- if (type > ARRAY_SIZE(scsi_device_types))
+ if (type >
=
ARRAY_SIZE(scsi_device_types))
return "Unknown ";
return scsi_device_types[type];
}
return "Unknown ";
return scsi_device_types[type];
}
@@
-592,12
+592,6
@@
int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
return rtn;
}
return rtn;
}
-
-/*
- * Per-CPU I/O completion queue.
- */
-static DEFINE_PER_CPU(struct list_head, scsi_done_q);
-
/**
* scsi_req_abort_cmd -- Request command recovery for the specified command
* cmd: pointer to the SCSI command of interest
/**
* scsi_req_abort_cmd -- Request command recovery for the specified command
* cmd: pointer to the SCSI command of interest
@@
-1065,7
+1059,7
@@
int scsi_device_cancel(struct scsi_device *sdev, int recovery)
spin_lock_irqsave(&sdev->list_lock, flags);
list_for_each_entry(scmd, &sdev->cmd_list, list) {
spin_lock_irqsave(&sdev->list_lock, flags);
list_for_each_entry(scmd, &sdev->cmd_list, list) {
- if (scmd->request
&& scmd->request->rq_status != RQ_INACTIVE
) {
+ if (scmd->request) {
/*
* If we are unable to remove the timer, it means
* that the command has already timed out or
/*
* If we are unable to remove the timer, it means
* that the command has already timed out or
@@
-1102,7
+1096,7
@@
MODULE_PARM_DESC(scsi_logging_level, "a bit mask of logging levels");
static int __init init_scsi(void)
{
static int __init init_scsi(void)
{
- int error
, i
;
+ int error;
error = scsi_init_queue();
if (error)
error = scsi_init_queue();
if (error)
@@
-1123,9
+1117,6
@@
static int __init init_scsi(void)
if (error)
goto cleanup_sysctl;
if (error)
goto cleanup_sysctl;
- for_each_possible_cpu(i)
- INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
-
scsi_netlink_init();
printk(KERN_NOTICE "SCSI subsystem initialized\n");
scsi_netlink_init();
printk(KERN_NOTICE "SCSI subsystem initialized\n");