1 files changed, 0 insertions, 9 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a6dea08664fc..a2408e591770 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -641,11 +641,6 @@ static void fixup_botched_add(struct ctlr_info *h,
 static inline int device_is_the_same(struct hpsa_scsi_dev_t *dev1,
         struct hpsa_scsi_dev_t *dev2)
 {
-        if ((is_logical_dev_addr_mode(dev1->scsi3addr) ||
-                (dev1->lun != -1 && dev2->lun != -1)) &&
-                dev1->devtype != 0x0C)
-                return (memcmp(dev1, dev2, sizeof(*dev1)) == 0);
-
         /* we compare everything except lun and target as these
          * are not yet assigned.  Compare parts likely
          * to differ first
@@ -660,8 +655,6 @@ static inline int device_is_the_same(struct hpsa_scsi_dev_t *dev1,
                 return 0;
         if (memcmp(dev1->vendor, dev2->vendor, sizeof(dev1->vendor)) != 0)
                 return 0;
-        if (memcmp(dev1->revision, dev2->revision, sizeof(dev1->revision)) != 0)
-                return 0;
         if (dev1->devtype != dev2->devtype)
                 return 0;
         if (dev1->raid_level != dev2->raid_level)
@@ -1477,8 +1470,6 @@ static int hpsa_update_device_info(struct ctlr_info *h,
                 sizeof(this_device->vendor));
         memcpy(this_device->model, &inq_buff[16],
                 sizeof(this_device->model));
-        memcpy(this_device->revision, &inq_buff[32],
-                sizeof(this_device->revision));
         memset(this_device->device_id, 0,
                 sizeof(this_device->device_id));
         hpsa_get_device_id(h, scsi3addr, this_device->device_id,