ALSA: i2sbus: Deletion of unnecessary checks before the function call "release_and_fr...
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 2 Dec 2014 21:50:24 +0000 (22:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Dec 2014 06:59:04 +0000 (07:59 +0100)
The release_and_free_resource() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/aoa/soundbus/i2sbus/core.c

index a80d5ea87ccd5f6421323ab951962e4a29a22f2b..4e2b4fbf2496817f31a17a1302346225628e86ee 100644 (file)
@@ -79,8 +79,7 @@ static void i2sbus_release_dev(struct device *dev)
        if (i2sdev->out.dbdma) iounmap(i2sdev->out.dbdma);
        if (i2sdev->in.dbdma) iounmap(i2sdev->in.dbdma);
        for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
-               if (i2sdev->allocated_resource[i])
-                       release_and_free_resource(i2sdev->allocated_resource[i]);
+               release_and_free_resource(i2sdev->allocated_resource[i]);
        free_dbdma_descriptor_ring(i2sdev, &i2sdev->out.dbdma_ring);
        free_dbdma_descriptor_ring(i2sdev, &i2sdev->in.dbdma_ring);
        for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)
@@ -323,8 +322,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
        if (dev->out.dbdma) iounmap(dev->out.dbdma);
        if (dev->in.dbdma) iounmap(dev->in.dbdma);
        for (i=0;i<3;i++)
-               if (dev->allocated_resource[i])
-                       release_and_free_resource(dev->allocated_resource[i]);
+               release_and_free_resource(dev->allocated_resource[i]);
        mutex_destroy(&dev->lock);
        kfree(dev);
        return 0;