scsi: osd_uld: remove an unneeded NULL check

We don't call the remove() function unless probe() succeeds so "oud"
can't be NULL here.  Plus, if it were NULL, we dereference it on the
next line so it would crash anyway.

[mkp: applied by hand]

Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Boaz Harrosh <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>

diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index e0ce5d2fd14d29656ab5409b9356217118ce0a98..c3563a9512b7ccff8d102f28cfd517b68d3a7805 100644 (file)
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -524,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);