Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff6defa6 authored by Markus Elfring's avatar Markus Elfring Committed by Takashi Iwai
Browse files

ALSA: Deletion of checks before the function call "iounmap" 



The iounmap() function performs also input parameter validation.
Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b76c0e95

sound/aoa/soundbus/i2sbus/core.c

+6 −7
Original line number Diff line number Diff line
@@ -74,10 +74,9 @@ static void i2sbus_release_dev(struct device *dev) 
	int i;



	i2sdev = container_of(dev, struct i2sbus_dev, sound.ofdev.dev);



 	if (i2sdev->intfregs) iounmap(i2sdev->intfregs);

 	if (i2sdev->out.dbdma) iounmap(i2sdev->out.dbdma);

 	if (i2sdev->in.dbdma) iounmap(i2sdev->in.dbdma);

	iounmap(i2sdev->intfregs);

	iounmap(i2sdev->out.dbdma);

	iounmap(i2sdev->in.dbdma);

	for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++)

		release_and_free_resource(i2sdev->allocated_resource[i]);

	free_dbdma_descriptor_ring(i2sdev, &i2sdev->out.dbdma_ring);
@@ -318,9 +317,9 @@ static int i2sbus_add_dev(struct macio_dev *macio, 
			free_irq(dev->interrupts[i], dev);

	free_dbdma_descriptor_ring(dev, &dev->out.dbdma_ring);

	free_dbdma_descriptor_ring(dev, &dev->in.dbdma_ring);

	if (dev->intfregs) iounmap(dev->intfregs);

	if (dev->out.dbdma) iounmap(dev->out.dbdma);

	if (dev->in.dbdma) iounmap(dev->in.dbdma);

	iounmap(dev->intfregs);

	iounmap(dev->out.dbdma);

	iounmap(dev->in.dbdma);

	for (i=0;i<3;i++)

		release_and_free_resource(dev->allocated_resource[i]);

	mutex_destroy(&dev->lock);

sound/arm/aaci.c

+2 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int aaci_probe_ac97(struct aaci *aaci) 
static void aaci_free_card(struct snd_card *card)

{

	struct aaci *aaci = card->private_data;

	if (aaci->base)



	iounmap(aaci->base);

}

sound/drivers/ml403-ac97cr.c

+1 −2
Original line number Diff line number Diff line
@@ -1094,7 +1094,6 @@ static int snd_ml403_ac97cr_free(struct snd_ml403_ac97cr *ml403_ac97cr) 
	if (ml403_ac97cr->capture_irq >= 0)

		free_irq(ml403_ac97cr->capture_irq, ml403_ac97cr);

	/* give back "port" */

	if (ml403_ac97cr->port != NULL)

	iounmap(ml403_ac97cr->port);

	kfree(ml403_ac97cr);

	PDEBUG(INIT_INFO, "free(): (done)\n");

sound/isa/msnd/msnd_pinnacle.c

+1 −2
Original line number Diff line number Diff line
@@ -627,7 +627,6 @@ static int snd_msnd_attach(struct snd_card *card) 
	return 0;



err_release_region:

	if (chip->mappedbase)

	iounmap(chip->mappedbase);

	release_mem_region(chip->base, BUFFSIZE);

	release_region(chip->io, DSP_NUMIO);

sound/parisc/harmony.c

+1 −3
Original line number Diff line number Diff line
@@ -893,9 +893,7 @@ snd_harmony_free(struct snd_harmony *h) 
	if (h->irq >= 0)

		free_irq(h->irq, h);



	if (h->iobase)

	iounmap(h->iobase);



	kfree(h);

	return 0;

}