aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptctl.c
diff options
context:
space:
mode:
authorEric Moore <eric.moore@lsi.com>2007-09-14 20:48:19 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:48:42 -0400
commita69de507aae293e32d22e873f34f25f49b2db3b2 (patch)
treec500e4b79da7a6462868b2d073f86dc07f4de953 /drivers/message/fusion/mptctl.c
parent8d6d83e90b874b0d6027d2bbf1d8c76dbf26e931 (diff)
[SCSI] mpt fusion: rename vdev to vdevice
common naming of vdevice through out driver Signed-off-by: Eric Moore <Eric.Moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
-rw-r--r--drivers/message/fusion/mptctl.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 5d137a8b3096..b7d1159916c2 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1175,7 +1175,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
1175 int cim_rev; 1175 int cim_rev;
1176 u8 revision; 1176 u8 revision;
1177 struct scsi_device *sdev; 1177 struct scsi_device *sdev;
1178 VirtDevice *vdev; 1178 VirtDevice *vdevice;
1179 1179
1180 /* Add of PCI INFO results in unaligned access for 1180 /* Add of PCI INFO results in unaligned access for
1181 * IA64 and Sparc. Reset long to int. Return no PCI 1181 * IA64 and Sparc. Reset long to int. Return no PCI
@@ -1270,8 +1270,8 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
1270 karg->numDevices = 0; 1270 karg->numDevices = 0;
1271 if (ioc->sh) { 1271 if (ioc->sh) {
1272 shost_for_each_device(sdev, ioc->sh) { 1272 shost_for_each_device(sdev, ioc->sh) {
1273 vdev = sdev->hostdata; 1273 vdevice = sdev->hostdata;
1274 if (vdev->vtarget->tflags & 1274 if (vdevice->vtarget->tflags &
1275 MPT_TARGET_FLAGS_RAID_COMPONENT) 1275 MPT_TARGET_FLAGS_RAID_COMPONENT)
1276 continue; 1276 continue;
1277 karg->numDevices++; 1277 karg->numDevices++;
@@ -1322,7 +1322,7 @@ mptctl_gettargetinfo (unsigned long arg)
1322 struct mpt_ioctl_targetinfo __user *uarg = (void __user *) arg; 1322 struct mpt_ioctl_targetinfo __user *uarg = (void __user *) arg;
1323 struct mpt_ioctl_targetinfo karg; 1323 struct mpt_ioctl_targetinfo karg;
1324 MPT_ADAPTER *ioc; 1324 MPT_ADAPTER *ioc;
1325 VirtDevice *vdev; 1325 VirtDevice *vdevice;
1326 char *pmem; 1326 char *pmem;
1327 int *pdata; 1327 int *pdata;
1328 int iocnum; 1328 int iocnum;
@@ -1391,13 +1391,13 @@ mptctl_gettargetinfo (unsigned long arg)
1391 shost_for_each_device(sdev, ioc->sh) { 1391 shost_for_each_device(sdev, ioc->sh) {
1392 if (!maxWordsLeft) 1392 if (!maxWordsLeft)
1393 continue; 1393 continue;
1394 vdev = sdev->hostdata; 1394 vdevice = sdev->hostdata;
1395 if (vdev->vtarget->tflags & 1395 if (vdevice->vtarget->tflags &
1396 MPT_TARGET_FLAGS_RAID_COMPONENT) 1396 MPT_TARGET_FLAGS_RAID_COMPONENT)
1397 continue; 1397 continue;
1398 lun = (vdev->vtarget->raidVolume) ? 0x80 : vdev->lun; 1398 lun = (vdevice->vtarget->raidVolume) ? 0x80 : vdevice->lun;
1399 *pdata = (((u8)lun << 16) + (vdev->vtarget->channel << 8) + 1399 *pdata = (((u8)lun << 16) + (vdevice->vtarget->channel << 8) +
1400 (vdev->vtarget->id )); 1400 (vdevice->vtarget->id ));
1401 pdata++; 1401 pdata++;
1402 numDevices++; 1402 numDevices++;
1403 --maxWordsLeft; 1403 --maxWordsLeft;