From: Takashi Iwai Subject: [RFC] Remove sound/driver.h Date: Thu, 20 Dec 2007 16:34:01 +0100 Message-ID: References: Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.suse.de (cantor.suse.de [195.135.220.2]) by alsa0.perex.cz (Postfix) with ESMTP id 05FBC24672 for ; Thu, 20 Dec 2007 18:32:31 +0100 (CET) Received: from Relay1.suse.de (relay-ext.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id E072524B71 for ; Thu, 20 Dec 2007 18:32:30 +0100 (CET) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org This is no concrete patch, but just shows you an essence. In many places, simply the inclusion of sound/driver.h is removed: diff -r 1f5b3ddb6636 isa/als100.c --- a/isa/als100.c Thu Dec 20 12:57:48 2007 +0100 +++ b/isa/als100.c Thu Dec 20 14:12:20 2007 +0100 @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include And, core.h and driver.h are changed like below. diff -r 1f5b3ddb6636 include/core.h --- a/include/core.h Thu Dec 20 12:57:48 2007 +0100 +++ b/include/core.h Thu Dec 20 14:12:20 2007 +0100 @@ -22,11 +22,21 @@ * */ +#include #include /* wake_up() */ #include /* struct mutex */ #include /* struct rw_semaphore */ #include /* pm_message_t */ #include + +/* 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 diff -r 1f5b3ddb6636 include/driver.h --- a/include/driver.h Thu Dec 20 12:57:48 2007 +0100 +++ b/include/driver.h Thu Dec 20 14:12:20 2007 +0100 @@ -1,47 +1,1 @@ -#ifndef __SOUND_DRIVER_H -#define __SOUND_DRIVER_H - -/* - * Main header file for the ALSA driver - * Copyright (c) 1994-2000 by Jaroslav Kysela - * - * - * 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 - -#endif /* __SOUND_DRIVER_H */ +#warning "This file is deprecated" The whole patch is too big to post here. Takashi