From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754137Ab0JKMCw (ORCPT ); Mon, 11 Oct 2010 08:02:52 -0400 Received: from cantor.suse.de ([195.135.220.2]:50497 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063Ab0JKMCv (ORCPT ); Mon, 11 Oct 2010 08:02:51 -0400 Date: Mon, 11 Oct 2010 14:02:50 +0200 Message-ID: From: Takashi Iwai To: Nicolas Kaiser Cc: Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [alsa-devel] [PATCH] sound/usb/usx2y: simplify conditional In-Reply-To: <20101005173812.5190495d@absol.kitzblitz> References: <20101005173812.5190495d@absol.kitzblitz> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) 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 Tue, 5 Oct 2010 17:38:12 +0200, Nicolas Kaiser wrote: > > Simplify conditional: (a || (!a && b)) => (a || b) > > Signed-off-by: Nicolas Kaiser Applied now. Thanks. Takashi > --- > sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c > index 2a528e5..3146a81 100644 > --- a/sound/usb/usx2y/usx2yhwdeppcm.c > +++ b/sound/usb/usx2y/usx2yhwdeppcm.c > @@ -54,7 +54,7 @@ > #include > #include "usbusx2yaudio.c" > > -#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1) > +#if defined(USX2Y_NRPACKS_VARIABLE) || USX2Y_NRPACKS == 1 > > #include > > -- > 1.7.2.2 > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >