Skip to content

Commit

Permalink
isci: debug fixes
Browse files Browse the repository at this point in the history
Some of the chain walks to get back to our dev are invalid.

isci_remote_device_change_state: delete rather than adding conditional deref
chain walking
isci_request_change_state: fix, it was being called too early
isci_request_ssp_io_request_get_lun: fix compile breakage hidden by ifdef DEBUG

Signed-off-by: Maciej Trela <maciej.trela@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Jul 3, 2011
1 parent 83e5143 commit 83f5eee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 0 additions & 6 deletions drivers/scsi/isci/remote_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -686,12 +686,6 @@ void isci_remote_device_change_state(
{
unsigned long flags;

dev_dbg(&isci_device->isci_port->isci_host->pdev->dev,
"%s: isci_device = %p, state = 0x%x",
__func__,
isci_device,
status);

spin_lock_irqsave(&isci_device->state_lock, flags);
isci_device->status = status;
spin_unlock_irqrestore(&isci_device->state_lock, flags);
Expand Down
6 changes: 3 additions & 3 deletions drivers/scsi/isci/request.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ static int isci_request_alloc_core(

/* initialize the request object. */
spin_lock_init(&request->state_lock);
isci_request_change_state(request, allocated);
request->sci_request_mem_ptr = ((u8 *)request) +
sizeof(struct isci_request);
request->request_daddr = handle;
Expand All @@ -302,6 +301,7 @@ static int isci_request_alloc_core(
INIT_LIST_HEAD(&request->dev_node);

*isci_request = request;
isci_request_change_state(request, allocated);

return ret;
}
Expand Down Expand Up @@ -1389,8 +1389,8 @@ u32 isci_request_ssp_io_request_get_lun(

for (i = 0; i < 8; i++)
dev_dbg(&request->isci_host->pdev->dev,
"%s: request->task->ssp_task.LUN[%d] = %x\n",
__func__, i, request->task->ssp_task.LUN[i]);
"%s: task->ssp_task.LUN[%d] = %x\n",
__func__, i, task->ssp_task.LUN[i]);

#endif

Expand Down

0 comments on commit 83f5eee

Please sign in to comment.