Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254327
b: refs/heads/master
c: 83f5eee
h: refs/heads/master
i:
  254325: 88a39ca
  254323: 2ddbd26
  254319: 69133cc
v: v3
  • Loading branch information
Dan Williams committed Jul 3, 2011
1 parent 238a506 commit db177b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83e514301ec73b16fb258618c9f9b443cca3744a
refs/heads/master: 83f5eeef59581faed6f002432bafe24da8cbf401
6 changes: 0 additions & 6 deletions trunk/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 trunk/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 db177b1

Please sign in to comment.