scsi: osd_uld: remove an unneeded NULL check

[karo-tx-linux.git] / drivers / scsi / osd / osd_uld.c

diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 243eab3d10d094e6dffff35f793f1c518e49fc15..c3563a9512b7ccff8d102f28cfd517b68d3a7805 100644 (file)
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -372,6 +372,7 @@ EXPORT_SYMBOL(osduld_device_same);
 static int __detect_osd(struct osd_uld_device *oud)
 {
        struct scsi_device *scsi_device = oud->od.scsi_device;
+       struct scsi_sense_hdr sense_hdr;
        char caps[OSD_CAP_LEN];
        int error;
 
@@ -380,7 +381,7 @@ static int __detect_osd(struct osd_uld_device *oud)
         */
        OSD_DEBUG("start scsi_test_unit_ready %p %p %p\n",
                        oud, scsi_device, scsi_device->request_queue);
-       error = scsi_test_unit_ready(scsi_device, 10*HZ, 5, NULL);
+       error = scsi_test_unit_ready(scsi_device, 10*HZ, 5, &sense_hdr);
        if (error)
                OSD_ERR("warning: scsi_test_unit_ready failed\n");
 
@@ -523,10 +524,9 @@ static int osd_remove(struct device *dev)
        struct scsi_device *scsi_device = to_scsi_device(dev);
        struct osd_uld_device *oud = dev_get_drvdata(dev);
 
-       if (!oud || (oud->od.scsi_device != scsi_device)) {
-               OSD_ERR("Half cooked osd-device %p,%p || %p!=%p",
-                       dev, oud, oud ? oud->od.scsi_device : NULL,
-                       scsi_device);
+       if (oud->od.scsi_device != scsi_device) {
+               OSD_ERR("Half cooked osd-device %p, || %p!=%p",
+                       dev, oud->od.scsi_device, scsi_device);
        }
 
        device_unregister(&oud->class_dev);