Skip to content

Commit

Permalink
[SCSI] mpt fusion: rename vdev to vdevice
Browse files Browse the repository at this point in the history 
common naming of vdevice through out driver

Signed-off-by: Eric Moore <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
  • Loading branch information
Eric Moore authored and James Bottomley committed Oct 12, 2007
1 parent 8d6d83e commit a69de50
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 60 deletions.
18 changes: 9 additions & 9 deletions drivers/message/fusion/mptctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
int cim_rev;
u8 revision;
struct scsi_device *sdev;
VirtDevice *vdev;
VirtDevice *vdevice;

/* Add of PCI INFO results in unaligned access for
* IA64 and Sparc. Reset long to int. Return no PCI
Expand Down Expand Up @@ -1270,8 +1270,8 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
karg->numDevices = 0;
if (ioc->sh) {
shost_for_each_device(sdev, ioc->sh) {
vdev = sdev->hostdata;
if (vdev->vtarget->tflags &
vdevice = sdev->hostdata;
if (vdevice->vtarget->tflags &
MPT_TARGET_FLAGS_RAID_COMPONENT)
continue;
karg->numDevices++;
Expand Down Expand Up @@ -1322,7 +1322,7 @@ mptctl_gettargetinfo (unsigned long arg)
struct mpt_ioctl_targetinfo __user *uarg = (void __user *) arg;
struct mpt_ioctl_targetinfo karg;
MPT_ADAPTER *ioc;
VirtDevice *vdev;
VirtDevice *vdevice;
char *pmem;
int *pdata;
int iocnum;
Expand Down Expand Up @@ -1391,13 +1391,13 @@ mptctl_gettargetinfo (unsigned long arg)
shost_for_each_device(sdev, ioc->sh) {
if (!maxWordsLeft)
continue;
vdev = sdev->hostdata;
if (vdev->vtarget->tflags &
vdevice = sdev->hostdata;
if (vdevice->vtarget->tflags &
MPT_TARGET_FLAGS_RAID_COMPONENT)
continue;
lun = (vdev->vtarget->raidVolume) ? 0x80 : vdev->lun;
*pdata = (((u8)lun << 16) + (vdev->vtarget->channel << 8) +
(vdev->vtarget->id ));
lun = (vdevice->vtarget->raidVolume) ? 0x80 : vdevice->lun;
*pdata = (((u8)lun << 16) + (vdevice->vtarget->channel << 8) +
(vdevice->vtarget->id ));
pdata++;
numDevices++;
--maxWordsLeft;
Expand Down
20 changes: 10 additions & 10 deletions drivers/message/fusion/mptfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
if (ready == DID_NO_CONNECT || !SCpnt->device->hostdata) {
dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT
"%s.%d: %d:%d, failing recovery, "
"port state %d, vdev %p.\n", caller,
"port state %d, vdevice %p.\n", caller,
((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
((MPT_SCSI_HOST *) shost->hostdata)->ioc->sh->host_no,
SCpnt->device->id, SCpnt->device->lun, ready,
Expand Down Expand Up @@ -470,7 +470,7 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
/*
* if already mapped, remap here. If not mapped,
* target_alloc will allocate vtarget and map,
* slave_alloc will fill in vdev from vtarget.
* slave_alloc will fill in vdevice from vtarget.
*/
if (ri->starget) {
vtarget = ri->starget->hostdata;
Expand Down Expand Up @@ -602,7 +602,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)
{
MPT_SCSI_HOST *hd;
VirtTarget *vtarget;
VirtDevice *vdev;
VirtDevice *vdevice;
struct scsi_target *starget;
struct fc_rport *rport;

Expand All @@ -615,24 +615,24 @@ mptfc_slave_alloc(struct scsi_device *sdev)

hd = (MPT_SCSI_HOST *)sdev->host->hostdata;

vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdev) {
vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
hd->ioc->name, sizeof(VirtDevice));
return -ENOMEM;
}


sdev->hostdata = vdev;
sdev->hostdata = vdevice;
vtarget = starget->hostdata;

if (vtarget->num_luns == 0) {
vtarget->ioc_id = hd->ioc->id;
vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
}

vdev->vtarget = vtarget;
vdev->lun = sdev->lun;
vdevice->vtarget = vtarget;
vdevice->lun = sdev->lun;

vtarget->num_luns++;

Expand All @@ -648,9 +648,9 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
struct mptfc_rport_info *ri;
struct fc_rport *rport = starget_to_rport(scsi_target(SCpnt->device));
int err;
VirtDevice *vdev = SCpnt->device->hostdata;
VirtDevice *vdevice = SCpnt->device->hostdata;

if (!vdev || !vdev->vtarget) {
if (!vdevice || !vdevice->vtarget) {
SCpnt->result = DID_NO_CONNECT << 16;
done(SCpnt);
return 0;
Expand Down
30 changes: 15 additions & 15 deletions drivers/message/fusion/mptsas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,15 +506,15 @@ static VirtTarget *
mptsas_find_vtarget(MPT_ADAPTER *ioc, u8 channel, u8 id)
{
struct scsi_device *sdev;
VirtDevice *vdev;
VirtDevice *vdevice;
VirtTarget *vtarget = NULL;

shost_for_each_device(sdev, ioc->sh) {
if ((vdev = sdev->hostdata) == NULL)
if ((vdevice = sdev->hostdata) == NULL)
continue;
if (vdev->vtarget->id == id &&
vdev->vtarget->channel == channel)
vtarget = vdev->vtarget;
if (vdevice->vtarget->id == id &&
vdevice->vtarget->channel == channel)
vtarget = vdevice->vtarget;
}
return vtarget;
}
Expand Down Expand Up @@ -943,18 +943,18 @@ mptsas_slave_alloc(struct scsi_device *sdev)
MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)host->hostdata;
struct sas_rphy *rphy;
struct mptsas_portinfo *p;
VirtDevice *vdev;
VirtDevice *vdevice;
struct scsi_target *starget;
int i;

vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdev) {
vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "slave_alloc kzalloc(%zd) FAILED!\n",
hd->ioc->name, sizeof(VirtDevice));
return -ENOMEM;
}
starget = scsi_target(sdev);
vdev->vtarget = starget->hostdata;
vdevice->vtarget = starget->hostdata;

if (sdev->channel == MPTSAS_RAID_CHANNEL)
goto out;
Expand All @@ -966,7 +966,7 @@ mptsas_slave_alloc(struct scsi_device *sdev)
if (p->phy_info[i].attached.sas_address !=
rphy->identify.sas_address)
continue;
vdev->lun = sdev->lun;
vdevice->lun = sdev->lun;
/*
* Exposing hidden raid components
*/
Expand All @@ -980,21 +980,21 @@ mptsas_slave_alloc(struct scsi_device *sdev)
}
mutex_unlock(&hd->ioc->sas_topology_mutex);

kfree(vdev);
kfree(vdevice);
return -ENXIO;

out:
vdev->vtarget->num_luns++;
sdev->hostdata = vdev;
vdevice->vtarget->num_luns++;
sdev->hostdata = vdevice;
return 0;
}

static int
mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
{
VirtDevice *vdev = SCpnt->device->hostdata;
VirtDevice *vdevice = SCpnt->device->hostdata;

if (!vdev || !vdev->vtarget || vdev->vtarget->deleted) {
if (!vdevice || !vdevice->vtarget || vdevice->vtarget->deleted) {
SCpnt->result = DID_NO_CONNECT << 16;
done(SCpnt);
return 0;
Expand Down
36 changes: 18 additions & 18 deletions drivers/message/fusion/mptscsih.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
SCSIIORequest_t *pScsiReq;
SCSIIOReply_t *pScsiReply;
u16 req_idx, req_idx_MR;
VirtDevice *vdev;
VirtDevice *vdevice;
VirtTarget *vtarget;

hd = (MPT_SCSI_HOST *) ioc->sh->hostdata;
Expand Down Expand Up @@ -770,10 +770,10 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
if (hd->sel_timeout[pScsiReq->TargetID] < 0xFFFF)
hd->sel_timeout[pScsiReq->TargetID]++;

vdev = sc->device->hostdata;
if (!vdev)
vdevice = sc->device->hostdata;
if (!vdevice)
break;
vtarget = vdev->vtarget;
vtarget = vdevice->vtarget;
if (vtarget->tflags & MPT_TARGET_FLAGS_LED_ON) {
mptscsih_issue_sep_command(ioc, vtarget,
MPI_SEP_REQ_SLOTSTATUS_UNCONFIGURED);
Expand Down Expand Up @@ -1359,7 +1359,7 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
MPT_SCSI_HOST *hd;
MPT_FRAME_HDR *mf;
SCSIIORequest_t *pScsiReq;
VirtDevice *vdev = SCpnt->device->hostdata;
VirtDevice *vdevice = SCpnt->device->hostdata;
int lun;
u32 datalen;
u32 scsictl;
Expand Down Expand Up @@ -1416,8 +1416,8 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
/* Default to untagged. Once a target structure has been allocated,
* use the Inquiry data to determine if device supports tagged.
*/
if (vdev
&& (vdev->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
if (vdevice
&& (vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
&& (SCpnt->device->tagged_supported)) {
scsictl = scsidir | MPI_SCSIIO_CONTROL_SIMPLEQ;
} else {
Expand All @@ -1426,10 +1426,10 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))

/* Use the above information to set up the message frame
*/
pScsiReq->TargetID = (u8) vdev->vtarget->id;
pScsiReq->Bus = vdev->vtarget->channel;
pScsiReq->TargetID = (u8) vdevice->vtarget->id;
pScsiReq->Bus = vdevice->vtarget->channel;
pScsiReq->ChainOffset = 0;
if (vdev->vtarget->tflags & MPT_TARGET_FLAGS_RAID_COMPONENT)
if (vdevice->vtarget->tflags & MPT_TARGET_FLAGS_RAID_COMPONENT)
pScsiReq->Function = MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH;
else
pScsiReq->Function = MPI_FUNCTION_SCSI_IO_REQUEST;
Expand Down Expand Up @@ -1968,7 +1968,7 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
{
MPT_SCSI_HOST *hd;
int retval;
VirtDevice *vdev;
VirtDevice *vdevice;
MPT_ADAPTER *ioc;

/* If we can't locate our host adapter structure, return FAILED status.
Expand All @@ -1987,9 +1987,9 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
if (hd->timeouts < -1)
hd->timeouts++;

vdev = SCpnt->device->hostdata;
vdevice = SCpnt->device->hostdata;
retval = mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
vdev->vtarget->channel, 0, 0, 0, mptscsih_get_tm_timeout(ioc));
vdevice->vtarget->channel, 0, 0, 0, mptscsih_get_tm_timeout(ioc));

printk(MYIOC_s_INFO_FMT "bus reset: %s (sc=%p)\n",
ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
Expand Down Expand Up @@ -2503,14 +2503,14 @@ mptscsih_slave_configure(struct scsi_device *sdev)
static void
mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply)
{
VirtDevice *vdev;
VirtDevice *vdevice;
SCSIIORequest_t *pReq;
u32 sense_count = le32_to_cpu(pScsiReply->SenseCount);

/* Get target structure
*/
pReq = (SCSIIORequest_t *) mf;
vdev = sc->device->hostdata;
vdevice = sc->device->hostdata;

if (sense_count) {
u8 *sense_data;
Expand All @@ -2524,7 +2524,7 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR
/* Log SMART data (asc = 0x5D, non-IM case only) if required.
*/
if ((hd->ioc->events) && (hd->ioc->eventTypes & (1 << MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE))) {
if ((sense_data[12] == 0x5D) && (vdev->vtarget->raidVolume == 0)) {
if ((sense_data[12] == 0x5D) && (vdevice->vtarget->raidVolume == 0)) {
int idx;
MPT_ADAPTER *ioc = hd->ioc;

Expand All @@ -2542,8 +2542,8 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR
if (hd->ioc->pcidev->vendor ==
PCI_VENDOR_ID_IBM) {
mptscsih_issue_sep_command(hd->ioc,
vdev->vtarget, MPI_SEP_REQ_SLOTSTATUS_PREDICTED_FAULT);
vdev->vtarget->tflags |=
vdevice->vtarget, MPI_SEP_REQ_SLOTSTATUS_PREDICTED_FAULT);
vdevice->vtarget->tflags |=
MPT_TARGET_FLAGS_LED_ON;
}
}
Expand Down
16 changes: 8 additions & 8 deletions drivers/message/fusion/mptspi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,26 +698,26 @@ static int mptspi_slave_alloc(struct scsi_device *sdev)
{
MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)sdev->host->hostdata;
VirtTarget *vtarget;
VirtDevice *vdev;
VirtDevice *vdevice;
struct scsi_target *starget;

if (sdev->channel == 1 &&
mptscsih_is_phys_disk(hd->ioc, 0, sdev->id) == 0)
return -ENXIO;

vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdev) {
vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
hd->ioc->name, sizeof(VirtDevice));
return -ENOMEM;
}

vdev->lun = sdev->lun;
sdev->hostdata = vdev;
vdevice->lun = sdev->lun;
sdev->hostdata = vdevice;

starget = scsi_target(sdev);
vtarget = starget->hostdata;
vdev->vtarget = vtarget;
vdevice->vtarget = vtarget;
vtarget->num_luns++;

if (sdev->channel == 1)
Expand Down Expand Up @@ -758,9 +758,9 @@ static int
mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
{
struct _MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata;
VirtDevice *vdev = SCpnt->device->hostdata;
VirtDevice *vdevice = SCpnt->device->hostdata;

if (!vdev || !vdev->vtarget) {
if (!vdevice || !vdevice->vtarget) {
SCpnt->result = DID_NO_CONNECT << 16;
done(SCpnt);
return 0;
Expand Down

0 comments on commit a69de50

Please sign in to comment.