From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762807AbYDVKJZ (ORCPT ); Tue, 22 Apr 2008 06:09:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760154AbYDVKJQ (ORCPT ); Tue, 22 Apr 2008 06:09:16 -0400 Received: from mx2.suse.de ([195.135.220.15]:59911 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759699AbYDVKJP (ORCPT ); Tue, 22 Apr 2008 06:09:15 -0400 Date: Tue, 22 Apr 2008 12:09:14 +0200 Message-ID: From: Takashi Iwai To: Stas Sergeev Cc: Andrew Morton , Dmitry Torokhov , Joseph Fannin , linux-kernel@vger.kernel.org, Greg KH , Kay Sievers Subject: Re: 2.6.25-mm1 (snd-pcsp causes driver conflict) In-Reply-To: <480CD281.6050902@aknet.ru> References: <20080418014757.52fb4a4f.akpm@linux-foundation.org> <20080419021343.GA3503@nineveh.local> <20080418200237.b5a9e805.akpm@linux-foundation.org> <20080419041429.GA8508@anvil.corenet.prv> <20080418212934.bbe84ee2.akpm@linux-foundation.org> <480CD281.6050902@aknet.ru> User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta28) (fuki) (+CVS-20070806) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 21 Apr 2008 21:44:33 +0400, Stas Sergeev wrote: > > Hello. > > Takashi Iwai wrote: > > [Added snd-pcsp author to Cc] > Thanks. > > > Seems that snd-pcsp registers as "pcspkr", which is identical with > > input pc-speaker driver. Does the patch below fix the problem? > Actually it does not. The reason is that > then it fails to match the platform device, > which is created in arch/x86/kernel/pcspeaker.c, > with the name of "pcspkr". Hm, the hardcoded string is no good thing. It should be defined in the common header if it's used in multiple places. I'm not 100% certain whether restrictng this in Kconfig is the correct fix. Basically this doesn't stop building both drivers. In theory, we can switch them dynamically. But, it's the easiest way to avoid unnecessary bugs right now, so let's merge it. > But we already had the patch for that in an > alsa tree, it probably got forgotten. Here > it is: > http://hg-mirror.alsa-project.org/alsa-driver/raw-file/90eeee75052f/utils/patches/pcsp-kernel-2.6.22-01.diff Err, no, this wasn't merged to sound git tree because apparently the patch is to 2.6.22 and you didn't resubmit it... > Also attaching it here. > It simply disables the pcspkr driver in > Kconfig. snd-pcsp has the copy of that > driver, so that only one driver would > drive the device. > > Does that fix look good? (presumably acked > by Takashi, otherwise the patch wouldn't > be in an alsa tree) No, I gave no ACK yet. The alsa-driver tree is our playground, and the patch merged to that tree doesn't mean that I approved it for linux-kernel merge. > diff -urN linux-2.6.24/drivers/input/misc/Kconfig linux-2.6.24-pcsp-kern/drivers/input/misc/Kconfig > --- linux-2.6.24/drivers/input/misc/Kconfig 2008-01-27 16:13:43.000000000 +0300 > +++ linux-2.6.24-pcsp-kern/drivers/input/misc/Kconfig 2008-01-27 17:03:31.000000000 +0300 > @@ -14,7 +14,8 @@ > > config INPUT_PCSPKR > tristate "PC Speaker support" > - depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES > + depends on (ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || \ > + PPC_PSERIES) && SND_PCSP=n I'd rather add a new line with a single "depends on SND_PCSP=n". You see a clear difference in the art of dependencies, one for architectures and one for driver-specific. thanks, Takashi