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

Commit 88e24c3a authored Sep 22, 2011 by Yong Zhang Committed by Takashi Iwai Sep 22, 2011

sound: irq: Remove IRQF_DISABLED



Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).

So now this flag is a NOOP and can be removed.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent af1910a8

include/sound/initval.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table)
	{		{
	while (*irq_table != -1) {		while (*irq_table != -1) {
	if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,		if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
	IRQF_DISABLED \| IRQF_PROBE_SHARED, "ALSA Test IRQ",		IRQF_PROBE_SHARED, "ALSA Test IRQ",
	(void *) irq_table)) {		(void *) irq_table)) {
	free_irq(irq_table, (void ) irq_table);		free_irq(irq_table, (void ) irq_table);
	return *irq_table;		return *irq_table;

sound/arm/aaci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -443,7 +443,7 @@ static int aaci_pcm_open(struct snd_pcm_substream *substream)
	mutex_lock(&aaci->irq_lock);		mutex_lock(&aaci->irq_lock);
	if (!aaci->users++) {		if (!aaci->users++) {
	ret = request_irq(aaci->dev->irq[0], aaci_irq,		ret = request_irq(aaci->dev->irq[0], aaci_irq,
	IRQF_SHARED \| IRQF_DISABLED, DRIVER_NAME, aaci);		IRQF_SHARED, DRIVER_NAME, aaci);
	if (ret != 0)		if (ret != 0)
	aaci->users--;		aaci->users--;
	}		}

sound/arm/pxa2xx-ac97-lib.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -359,7 +359,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
	if (ret)		if (ret)
	goto err_clk2;		goto err_clk2;

	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL);		ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL);
	if (ret < 0)		if (ret < 0)
	goto err_irq;		goto err_irq;

sound/drivers/ml403-ac97cr.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card card, struct platform_device pfdev,
	"0x%x done\n", (unsigned int)ml403_ac97cr->port);		"0x%x done\n", (unsigned int)ml403_ac97cr->port);
	/* get irq */		/* get irq */
	irq = platform_get_irq(pfdev, 0);		irq = platform_get_irq(pfdev, 0);
	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,		if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
	dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {		dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
	snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
	"unable to grab IRQ %d\n",		"unable to grab IRQ %d\n",
	@@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card card, struct platform_device pfdev,
	"request (playback) irq %d done\n",		"request (playback) irq %d done\n",
	ml403_ac97cr->irq);		ml403_ac97cr->irq);
	irq = platform_get_irq(pfdev, 1);		irq = platform_get_irq(pfdev, 1);
	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,		if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
	dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {		dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
	snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
	"unable to grab IRQ %d\n",		"unable to grab IRQ %d\n",

sound/drivers/mpu401/mpu401_uart.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -577,7 +577,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
	else		else
	mpu->cport = port + 1;		mpu->cport = port + 1;
	if (irq >= 0) {		if (irq >= 0) {
	if (request_irq(irq, snd_mpu401_uart_interrupt, IRQF_DISABLED,		if (request_irq(irq, snd_mpu401_uart_interrupt, 0,
	"MPU401 UART", (void *) mpu)) {		"MPU401 UART", (void *) mpu)) {
	snd_printk(KERN_ERR "mpu401_uart: "		snd_printk(KERN_ERR "mpu401_uart: "
	"unable to grab IRQ %d\n", irq);		"unable to grab IRQ %d\n", irq);