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

Commit 988aec3d authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai
Browse files

ALSA: isa: Move snd_legacy_find_free_ioport to initval.h 



Move snd_legacy_find_free_ioport() function back to initval.h as it is used
by two drivers.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0d7614f0

include/sound/initval.h

+14 −0
Original line number Diff line number Diff line
@@ -50,6 +50,20 @@ 
#define SNDRV_DEFAULT_DMA_SIZE	{ [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }

#define SNDRV_DEFAULT_PTR	SNDRV_DEFAULT_STR



#ifdef SNDRV_LEGACY_FIND_FREE_IOPORT

static long snd_legacy_find_free_ioport(long *port_table, long size)

{

	while (*port_table != -1) {

		if (request_region(*port_table, size, "ALSA test")) {

			release_region(*port_table, size);

			return *port_table;

		}

		port_table++;

	}

	return -1;

}

#endif



#ifdef SNDRV_LEGACY_FIND_FREE_IRQ

#include <linux/interrupt.h>

sound/isa/opti9xx/miro.c

+1 −14
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <sound/opl4.h>

#include <sound/control.h>

#include <sound/info.h>

#define SNDRV_LEGACY_FIND_FREE_IOPORT

#define SNDRV_LEGACY_FIND_FREE_IRQ

#define SNDRV_LEGACY_FIND_FREE_DMA

#include <sound/initval.h>
@@ -770,20 +771,6 @@ static int __devinit snd_miro_mixer(struct snd_card *card, 
	return 0;

}



static long snd_legacy_find_free_ioport(long *port_table, long size)

{

	while (*port_table != -1) {

		struct resource *res;

		if ((res = request_region(*port_table, size, 

					  "ALSA test")) != NULL) {

			release_and_free_resource(res);

			return *port_table;

		}

		port_table++;

	}

	return -1;

}



static int __devinit snd_miro_init(struct snd_miro *chip,

				   unsigned short hardware)

{

sound/isa/opti9xx/opti92x-ad1848.c

+1 −13
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#ifndef OPTi93X

#include <sound/opl4.h>

#endif

#define SNDRV_LEGACY_FIND_FREE_IOPORT

#define SNDRV_LEGACY_FIND_FREE_IRQ

#define SNDRV_LEGACY_FIND_FREE_DMA

#include <sound/initval.h>
@@ -185,19 +186,6 @@ static char * snd_opti9xx_names[] = { 
	"82C930",	"82C931",	"82C933"

};





static long __devinit snd_legacy_find_free_ioport(long *port_table, long size)

{

	while (*port_table != -1) {

		if (request_region(*port_table, size, "ALSA test")) {

			release_region(*port_table, size);

			return *port_table;

		}

		port_table++;

	}

	return -1;

}



static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,

				      unsigned short hardware)

{