git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
ibmvscsi
/
rpa_vscsi.c
diff --git
a/drivers/scsi/ibmvscsi/rpa_vscsi.c
b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index
1a9992b
..
f47dd87
100644
(file)
--- a/
drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/
drivers/scsi/ibmvscsi/rpa_vscsi.c
@@
-34,6
+34,7
@@
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include "ibmvscsi.h"
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include "ibmvscsi.h"
+#include "srp.h"
static char partition_name[97] = "UNKNOWN";
static unsigned int partition_number = -1;
static char partition_name[97] = "UNKNOWN";
static unsigned int partition_number = -1;
@@
-79,7
+80,7
@@
void ibmvscsi_release_crq_queue(struct crq_queue *queue,
tasklet_kill(&hostdata->srp_task);
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
tasklet_kill(&hostdata->srp_task);
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
- } while ((rc == H_B
USY) || (H_IS_LONG_BUSY
(rc)));
+ } while ((rc == H_B
usy) || (H_isLongBusy
(rc)));
dma_unmap_single(hostdata->dev,
queue->msg_token,
queue->size * sizeof(*queue->msgs), DMA_BIDIRECTIONAL);
dma_unmap_single(hostdata->dev,
queue->msg_token,
queue->size * sizeof(*queue->msgs), DMA_BIDIRECTIONAL);
@@
-229,7
+230,7
@@
int ibmvscsi_init_crq_queue(struct crq_queue *queue,
rc = plpar_hcall_norets(H_REG_CRQ,
vdev->unit_address,
queue->msg_token, PAGE_SIZE);
rc = plpar_hcall_norets(H_REG_CRQ,
vdev->unit_address,
queue->msg_token, PAGE_SIZE);
- if (rc == H_R
ESOURCE)
+ if (rc == H_R
esource)
/* maybe kexecing and resource is busy. try a reset */
rc = ibmvscsi_reset_crq_queue(queue,
hostdata);
/* maybe kexecing and resource is busy. try a reset */
rc = ibmvscsi_reset_crq_queue(queue,
hostdata);
@@
-268,7
+269,7
@@
int ibmvscsi_init_crq_queue(struct crq_queue *queue,
req_irq_failed:
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
req_irq_failed:
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
- } while ((rc == H_B
USY) || (H_IS_LONG_BUSY
(rc)));
+ } while ((rc == H_B
usy) || (H_isLongBusy
(rc)));
reg_crq_failed:
dma_unmap_single(hostdata->dev,
queue->msg_token,
reg_crq_failed:
dma_unmap_single(hostdata->dev,
queue->msg_token,
@@
-294,7
+295,7
@@
int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
/* Re-enable the CRQ */
do {
rc = plpar_hcall_norets(H_ENABLE_CRQ, vdev->unit_address);
/* Re-enable the CRQ */
do {
rc = plpar_hcall_norets(H_ENABLE_CRQ, vdev->unit_address);
- } while ((rc == H_I
N_PROGRESS) || (rc == H_BUSY) || (H_IS_LONG_BUSY
(rc)));
+ } while ((rc == H_I
nProgress) || (rc == H_Busy) || (H_isLongBusy
(rc)));
if (rc)
printk(KERN_ERR "ibmvscsi: Error %d enabling adapter\n", rc);
if (rc)
printk(KERN_ERR "ibmvscsi: Error %d enabling adapter\n", rc);
@@
-316,7
+317,7
@@
int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
/* Close the CRQ */
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
/* Close the CRQ */
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
- } while ((rc == H_B
USY) || (H_IS_LONG_BUSY
(rc)));
+ } while ((rc == H_B
usy) || (H_isLongBusy
(rc)));
/* Clean out the queue */
memset(queue->msgs, 0x00, PAGE_SIZE);
/* Clean out the queue */
memset(queue->msgs, 0x00, PAGE_SIZE);