Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: isa: Move snd_legacy_find_free_ioport to initval.h

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

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Ondrej Zary 2012-08-01 16:05:39 +02:00 committed by Takashi Iwai
parent 0d7614f09c
commit 988aec3de5
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/sound/initval.h
View File

@ -50,6 +50,20 @@
#define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE } #define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
#define SNDRV_DEFAULT_PTR SNDRV_DEFAULT_STR #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 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
#include <linux/interrupt.h> #include <linux/interrupt.h>

15
sound/isa/opti9xx/miro.c
View File

@ -37,6 +37,7 @@
#include <sound/opl4.h> #include <sound/opl4.h>
#include <sound/control.h> #include <sound/control.h>
#include <sound/info.h> #include <sound/info.h>
#define SNDRV_LEGACY_FIND_FREE_IOPORT
#define SNDRV_LEGACY_FIND_FREE_IRQ #define SNDRV_LEGACY_FIND_FREE_IRQ
#define SNDRV_LEGACY_FIND_FREE_DMA #define SNDRV_LEGACY_FIND_FREE_DMA
#include <sound/initval.h> #include <sound/initval.h>
@ -770,20 +771,6 @@ static int __devinit snd_miro_mixer(struct snd_card *card,
return 0; 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, static int __devinit snd_miro_init(struct snd_miro *chip,
unsigned short hardware) unsigned short hardware)
{ {

14
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -39,6 +39,7 @@
#ifndef OPTi93X #ifndef OPTi93X
#include <sound/opl4.h> #include <sound/opl4.h>
#endif #endif
#define SNDRV_LEGACY_FIND_FREE_IOPORT
#define SNDRV_LEGACY_FIND_FREE_IRQ #define SNDRV_LEGACY_FIND_FREE_IRQ
#define SNDRV_LEGACY_FIND_FREE_DMA #define SNDRV_LEGACY_FIND_FREE_DMA
#include <sound/initval.h> #include <sound/initval.h>
@ -185,19 +186,6 @@ static char * snd_opti9xx_names[] = {
"82C930", "82C931", "82C933" "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, static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
unsigned short hardware) unsigned short hardware)
{ {