Commit 9004acc7 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 31e8960b
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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)
......
......@@ -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>
......
......@@ -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 */
......
......@@ -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>
......
#ifndef __ASM_ARCH_AUDIO_H__
#define __ASM_ARCH_AUDIO_H__
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -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;
......
#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"
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -59,7 +59,6 @@
*
***************************************************************************************************/
#include <sound/driver.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/threads.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/errno.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/major.h>
#include <linux/init.h>
#include <linux/slab.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/smp_lock.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/string.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/file.h>
......
......@@ -26,7 +26,6 @@
#undef HAVE_REALLY_SLOW_DMA_CONTROLLER
#include <sound/driver.h>
#include <sound/core.h>
#include <asm/dma.h>
......
......@@ -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
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/time.h>
#include <linux/ioport.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
......
......@@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -26,7 +26,6 @@
#define OSS_DEBUG
#endif
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
......
......@@ -24,7 +24,6 @@
#define PLUGIN_DEBUG
#endif
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/vmalloc.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <sound/core.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
......
......@@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <sound/core.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/time.h>
#include <linux/init.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/mm.h>
#include <linux/file.h>
#include <linux/slab.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/major.h>
#include <linux/init.h>
......
......@@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
......
......@@ -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>
......
......@@ -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>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
......
......@@ -21,7 +21,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <sound/core.h>
......
......@@ -36,7 +36,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/core.h>
#include <sound/info.h>
......
......@@ -18,7 +18,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/moduleparam.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include <linux/slab.h>
#include "seq_fifo.h"
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <sound/core.h>
......
......@@ -19,7 +19,6 @@
*
*/
#include <sound/driver.h>
#include <sound/core.h>
#include "seq_lock.h"
......
......@@ -20,7 +20,6 @@
*
*/
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......