[SCSI] fusion - removing target_id/bus_id from the VirtDevice structure

It makes no sense in keeping the target_id and bus_id
in the VirtDevice structure, when it can be obtained
from the VirtTarget structure.

In addition, this patch fix's couple compilation bugs
in mptfc.c when MPT_DEBUG_FC is enabled. This
provided by Micheal Reed.

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 9af69dd66f8..09c745b19cc 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -343,9 +343,9 @@ static int mptspi_slave_alloc(struct scsi_device *sdev)
                 sdev->no_uld_attach = 1;
                 vdev->vtarget->tflags |= MPT_TARGET_FLAGS_RAID_COMPONENT;
                 /* The real channel for this device is zero */
-                vdev->bus_id = 0;
+                vdev->vtarget->bus_id = 0;
                 /* The actual physdisknum (for RAID passthrough) */
-                vdev->target_id = physdisknum;
+                vdev->vtarget->target_id = physdisknum;
         }
 
         return 0;