[ALSA] Remove sound/driver.h

This header file exists only for some hacks to adapt alsa-driver
tree.  It's useless for building in the kernel.  Let's move a few
lines in it to sound/core.h and remove it.
With this patch, sound/driver.h isn't removed but has just a single
compile warning to include it.  This should be really killed in
future.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Iwai 2008-01-08 18:13:27 +01:00 committed by Jaroslav Kysela
parent 31e8960b35
commit 9004acc70e
347 changed files with 20 additions and 408 deletions

View File

@ -394,7 +394,6 @@
<title>Basic Flow for PCI Drivers - Example</title>
<programlisting>
<![CDATA[
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
@ -751,7 +750,6 @@
<informalexample>
<programlisting>
<![CDATA[
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>

View File

@ -27,7 +27,6 @@
#include <linux/kthread.h>
#include <linux/freezer.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/ac97_codec.h>

View File

@ -33,7 +33,6 @@
#include <linux/pci.h>
#include <asm/delay.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>

View File

@ -21,7 +21,6 @@
#include <linux/time.h>
#include <linux/wait.h>
#include <linux/module.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>

View File

@ -38,7 +38,6 @@
#include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
#include <media/videobuf-dma-sg.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)

View File

@ -24,7 +24,6 @@
#include <linux/utsname.h>
#include <linux/device.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/rawmidi.h>

View File

@ -31,7 +31,6 @@
#include <asm/arch/hardware.h>
#include <asm/irq.h>
#include <sound/driver.h>
#include <sound/core.h>
/* master codec clock source */

View File

@ -40,7 +40,6 @@
#ifndef __OMAP_ALSA_H
#define __OMAP_ALSA_H
#include <sound/driver.h>
#include <asm/arch/dma.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -1,7 +1,6 @@
#ifndef __ASM_ARCH_AUDIO_H__
#define __ASM_ARCH_AUDIO_H__
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -22,12 +22,22 @@
*
*/
#include <linux/module.h>
#include <linux/sched.h> /* wake_up() */
#include <linux/mutex.h> /* struct mutex */
#include <linux/rwsem.h> /* struct rw_semaphore */
#include <linux/pm.h> /* pm_message_t */
#include <linux/device.h>
/* number of supported soundcards */
#ifdef CONFIG_SND_DYNAMIC_MINORS
#define SNDRV_CARDS 32
#else
#define SNDRV_CARDS 8 /* don't change - minor numbers */
#endif
#define CONFIG_SND_MAJOR 116 /* standard configuration */
/* forward declarations */
#ifdef CONFIG_PCI
struct pci_dev;

View File

@ -1,47 +1 @@
#ifndef __SOUND_DRIVER_H
#define __SOUND_DRIVER_H
/*
* Main header file for the ALSA driver
* Copyright (c) 1994-2000 by Jaroslav Kysela <perex@perex.cz>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifdef ALSA_BUILD
#include "config.h"
#endif
/* number of supported soundcards */
#ifdef CONFIG_SND_DYNAMIC_MINORS
#define SNDRV_CARDS 32
#else
#define SNDRV_CARDS 8 /* don't change - minor numbers */
#endif
#ifndef CONFIG_SND_MAJOR /* standard configuration */
#define CONFIG_SND_MAJOR 116
#endif
#ifdef ALSA_BUILD
#include "adriver.h"
#endif
#include <linux/module.h>
#endif /* __SOUND_DRIVER_H */
#warning "This file is deprecated"

View File

@ -51,19 +51,16 @@
*
*/
#include "driver.h"
#include <linux/time.h>
#include <linux/mutex.h>
#include "core.h"
#include "hwdep.h"
#include "timer.h"
#include "seq_midi_emul.h"
#include <sound/core.h>
#include <sound/hwdep.h>
#include <sound/timer.h>
#include <sound/seq_midi_emul.h>
#ifdef CONFIG_SND_SEQUENCER_OSS
#include "seq_oss.h"
#include "seq_oss_legacy.h"
#include <sound/seq_oss.h>
#include <sound/seq_oss_legacy.h>
#endif
#include "seq_device.h"
#include "asound_fm.h"
#include <sound/seq_device.h>
#include <sound/asound_fm.h>
/*
* Register numbers for the global registers

View File

@ -16,7 +16,6 @@
#include <linux/platform_device.h>
#include <linux/types.h>
#include <linux/workqueue.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/control.h>

View File

@ -10,8 +10,6 @@
#define __AOA_H
#include <asm/prom.h>
#include <linux/module.h>
/* So apparently there's a reason for requiring driver.h to be included first! */
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/asound.h>
#include <sound/control.h>

View File

@ -11,7 +11,6 @@
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <asm/macio.h>

View File

@ -8,9 +8,6 @@
#include <asm/io.h>
#include <linux/delay.h>
/* So apparently there's a reason for requiring driver.h
* to be included first, even if I don't know it... */
#include <sound/driver.h>
#include <sound/core.h>
#include <asm/macio.h>
#include <linux/pci.h>

View File

@ -23,7 +23,6 @@
#include <asm/irq.h>
#include <asm/sizes.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/ac97_codec.h>

View File

@ -12,7 +12,6 @@
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -18,7 +18,6 @@
#include <linux/wait.h>
#include <linux/delay.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/ac97_codec.h>

View File

@ -16,7 +16,6 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>

View File

@ -59,7 +59,6 @@
*
***************************************************************************************************/
#include <sound/driver.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/threads.h>
#include <linux/interrupt.h>
#include <linux/slab.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/errno.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/major.h>
#include <linux/init.h>
#include <linux/slab.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/smp_lock.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/string.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/file.h>

View File

@ -26,7 +26,6 @@
#undef HAVE_REALLY_SLOW_DMA_CONTROLLER
#include <sound/driver.h>
#include <sound/core.h>
#include <asm/dma.h>

View File

@ -20,9 +20,9 @@
*
*/
#include <linux/module.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <sound/core.h>
/**
* copy_to_user_fromio - copy data from mmio-space to user-space

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/ioport.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>

View File

@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -26,7 +26,6 @@
#define OSS_DEBUG
#endif
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>

View File

@ -24,7 +24,6 @@
#define PLUGIN_DEBUG
#endif
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/vmalloc.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <sound/core.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <sound/core.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/time.h>
#include <linux/init.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/mm.h>
#include <linux/file.h>
#include <linux/slab.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/major.h>
#include <linux/init.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <linux/mutex.h>

View File

@ -21,7 +21,6 @@
#ifndef __SEQ_OSS_DEVICE_H
#define __SEQ_OSS_DEVICE_H
#include <sound/driver.h>
#include <linux/time.h>
#include <linux/wait.h>
#include <linux/slab.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <sound/core.h>

View File

@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <sound/core.h>

View File

@ -36,7 +36,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/core.h>
#include <sound/info.h>

View File

@ -18,7 +18,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/moduleparam.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/slab.h>
#include "seq_fifo.h"

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/core.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include "seq_lock.h"

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>

View File

@ -26,7 +26,6 @@ Possible options for midisynth module:
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/errno.h>

View File

@ -29,7 +29,6 @@
* code in here. If there is it should be reported as a bug.
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/string.h>

View File

@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/string.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/slab.h>
#include "seq_system.h"

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <linux/slab.h>
#include <sound/core.h>

View File

@ -35,7 +35,6 @@
* - Addition of experimental sync support.
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <sound/core.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/core.h>
#include "seq_system.h"

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/slab.h>
#include "seq_timer.h"

View File

@ -35,7 +35,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/wait.h>
#include <linux/slab.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>

View File

@ -19,8 +19,6 @@
*
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_OSSEMUL
#if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE))

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/slab.h>

View File

@ -18,7 +18,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/platform_device.h>

View File

@ -33,7 +33,6 @@
* But there might still be some ...
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/moduleparam.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/pnp.h>
#include <linux/err.h>

View File

@ -28,7 +28,6 @@
*
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>

View File

@ -50,7 +50,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/err.h>

View File

@ -18,7 +18,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/parport.h>

View File

@ -25,8 +25,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* #dependency of sound/core.h# */
#include <sound/driver.h>
/* snd_printk/d() */
#include <sound/core.h>
/* struct snd_pcm_substream, struct snd_pcm_runtime, snd_pcm_uframes_t

View File

@ -37,7 +37,6 @@
* - ported from alsa 0.5 to 1.0
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/parport.h>

View File

@ -30,7 +30,6 @@
* More documentation can be found in serial-u16550.txt.
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/err.h>

View File

@ -41,7 +41,6 @@
* - Run application using a midi device (eg. /dev/snd/midiC1D0)
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/wait.h>
#include <linux/err.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/vx_core.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/interrupt.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/device.h>
#include <linux/firmware.h>
#include <linux/vmalloc.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/tlv.h>

View File

@ -45,7 +45,6 @@
* - scheduled action on the stream.
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>

View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/delay.h>
#include <sound/core.h>
#include <sound/vx_core.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/init.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/string.h>

View File

@ -19,7 +19,6 @@
/* $Id: uda1341.c,v 1.18 2005/11/17 14:17:21 tiwai Exp $ */
#include <sound/driver.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <sound/core.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <sound/core.h>

View File

@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>

View File

@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/tlv.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>

View File

@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <sound/core.h>

View File

@ -18,7 +18,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/wait.h>

View File

@ -17,7 +17,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>

View File

@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/isa.h>

View File

@ -20,7 +20,6 @@
*/
#define SNDRV_MAIN_OBJECT_FILE
#include <sound/driver.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>

View File

@ -2,7 +2,6 @@
* AdLib FM card driver.
*/
#include <sound/driver.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/isa.h>

View File

@ -20,7 +20,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/wait.h>
#include <linux/time.h>

Some files were not shown because too many files have changed in this diff Show More