* [PATCH] sound/usb/usx2y: simplify conditional
@ 2010-10-05 15:38 Nicolas Kaiser
2010-10-11 12:02 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Kaiser @ 2010-10-05 15:38 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: alsa-devel, linux-kernel
Simplify conditional: (a || (!a && b)) => (a || b)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
---
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 <linux/gfp.h>
#include "usbusx2yaudio.c"
-#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1)
+#if defined(USX2Y_NRPACKS_VARIABLE) || USX2Y_NRPACKS == 1
#include <sound/hwdep.h>
--
1.7.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound/usb/usx2y: simplify conditional
2010-10-05 15:38 [PATCH] sound/usb/usx2y: simplify conditional Nicolas Kaiser
@ 2010-10-11 12:02 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-10-11 12:02 UTC (permalink / raw)
To: Nicolas Kaiser; +Cc: alsa-devel, linux-kernel
At Tue, 5 Oct 2010 17:38:12 +0200,
Nicolas Kaiser wrote:
>
> Simplify conditional: (a || (!a && b)) => (a || b)
>
> Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
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 <linux/gfp.h>
> #include "usbusx2yaudio.c"
>
> -#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1)
> +#if defined(USX2Y_NRPACKS_VARIABLE) || USX2Y_NRPACKS == 1
>
> #include <sound/hwdep.h>
>
> --
> 1.7.2.2
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-11 12:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-05 15:38 [PATCH] sound/usb/usx2y: simplify conditional Nicolas Kaiser
2010-10-11 12:02 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).