From: Roman Sommer <roman.sommer@fau.de> To: unlisted-recipients:; (no To-header on input) Cc: "Roman Sommer" <roman.sommer@fau.de>, linux-kernel@i4.cs.fau.de, "Daniel Graefe" <daniel.graefe@fau.de>, "Jaroslav Kysela" <perex@perex.cz>, "Takashi Iwai" <tiwai@suse.com>, "Takashi Sakamoto" <o-takashi@sakamocchi.jp>, "Hans P. Möller Ebner" <hmoller@uc.cl>, "Kees Cook" <keescook@chromium.org>, "Kate Stewart" <kstewart@linuxfoundation.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Fabián Inostroza" <soulsonceonfire@gmail.com>, "Bhumika Goyal" <bhumirks@gmail.com>, "Philippe Ombredanne" <pombredanne@nexb.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] sound/line6: add newline after declarations Date: Mon, 18 Jun 2018 12:29:39 +0200 [thread overview] Message-ID: <1529317779-15908-4-git-send-email-roman.sommer@fau.de> (raw) In-Reply-To: <1529317779-15908-1-git-send-email-roman.sommer@fau.de> CC: Jaroslav Kysela <perex@perex.cz> CC: Takashi Iwai <tiwai@suse.com> CC: Takashi Sakamoto <o-takashi@sakamocchi.jp> CC: "Hans P. Möller Ebner" <hmoller@uc.cl> CC: Kees Cook <keescook@chromium.org> CC: Kate Stewart <kstewart@linuxfoundation.org> CC: Thomas Gleixner <tglx@linutronix.de> CC: "Fabián Inostroza" <soulsonceonfire@gmail.com> CC: Bhumika Goyal <bhumirks@gmail.com> CC: Philippe Ombredanne <pombredanne@nexb.com> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: alsa-devel@alsa-project.org CC: linux-kernel@vger.kernel.org This patch adds newlines after variable declarations in sound/usb/line6. Signed-off-by: Roman Sommer <roman.sommer@fau.de> Signed-off-by: Daniel Graefe <daniel.graefe@fau.de> --- sound/usb/line6/driver.h | 1 + sound/usb/line6/playback.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 1dfb6de..4dff70c 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -174,6 +174,7 @@ struct usb_line6 { struct mutex read_lock; wait_queue_head_t wait_queue; unsigned int active:1; + STRUCT_KFIFO_REC_2(LINE6_BUFSIZE_LISTEN * LINE6_RAW_MESSAGES_MAXCOUNT) fifo; } messages; diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 674502c..1e16a5c 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c @@ -39,6 +39,7 @@ static void change_volume(struct urb *urb_out, int volume[], for (; p < buf_end; ++p) { short pv = le16_to_cpu(*p); int val = (pv * volume[chn & 1]) >> 8; + pv = clamp(val, -0x8000, 0x7fff); *p = cpu_to_le16(pv); ++chn; @@ -126,6 +127,7 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal, short pov = le16_to_cpu(*po); short piv = le16_to_cpu(*pi); int val = pov + ((piv * volume) >> 8); + pov = clamp(val, -0x8000, 0x7fff); *po = cpu_to_le16(pov); } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Roman Sommer <roman.sommer@fau.de> Cc: "Roman Sommer" <roman.sommer@fau.de>, linux-kernel@i4.cs.fau.de, "Daniel Graefe" <daniel.graefe@fau.de>, "Jaroslav Kysela" <perex@perex.cz>, "Takashi Iwai" <tiwai@suse.com>, "Takashi Sakamoto" <o-takashi@sakamocchi.jp>, "Hans P. Möller Ebner" <hmoller@uc.cl>, "Kees Cook" <keescook@chromium.org>, "Kate Stewart" <kstewart@linuxfoundation.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Fabián Inostroza" <soulsonceonfire@gmail.com>, "Bhumika Goyal" <bhumirks@gmail.com>, "Philippe Ombredanne" <pombredanne@nexb.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] sound/line6: add newline after declarations Date: Mon, 18 Jun 2018 12:29:39 +0200 [thread overview] Message-ID: <1529317779-15908-4-git-send-email-roman.sommer@fau.de> (raw) In-Reply-To: <1529317779-15908-1-git-send-email-roman.sommer@fau.de> CC: Jaroslav Kysela <perex@perex.cz> CC: Takashi Iwai <tiwai@suse.com> CC: Takashi Sakamoto <o-takashi@sakamocchi.jp> CC: "Hans P. Möller Ebner" <hmoller@uc.cl> CC: Kees Cook <keescook@chromium.org> CC: Kate Stewart <kstewart@linuxfoundation.org> CC: Thomas Gleixner <tglx@linutronix.de> CC: "Fabián Inostroza" <soulsonceonfire@gmail.com> CC: Bhumika Goyal <bhumirks@gmail.com> CC: Philippe Ombredanne <pombredanne@nexb.com> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: alsa-devel@alsa-project.org CC: linux-kernel@vger.kernel.org This patch adds newlines after variable declarations in sound/usb/line6. Signed-off-by: Roman Sommer <roman.sommer@fau.de> Signed-off-by: Daniel Graefe <daniel.graefe@fau.de> --- sound/usb/line6/driver.h | 1 + sound/usb/line6/playback.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 1dfb6de..4dff70c 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -174,6 +174,7 @@ struct usb_line6 { struct mutex read_lock; wait_queue_head_t wait_queue; unsigned int active:1; + STRUCT_KFIFO_REC_2(LINE6_BUFSIZE_LISTEN * LINE6_RAW_MESSAGES_MAXCOUNT) fifo; } messages; diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 674502c..1e16a5c 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c @@ -39,6 +39,7 @@ static void change_volume(struct urb *urb_out, int volume[], for (; p < buf_end; ++p) { short pv = le16_to_cpu(*p); int val = (pv * volume[chn & 1]) >> 8; + pv = clamp(val, -0x8000, 0x7fff); *p = cpu_to_le16(pv); ++chn; @@ -126,6 +127,7 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal, short pov = le16_to_cpu(*po); short piv = le16_to_cpu(*pi); int val = pov + ((piv * volume) >> 8); + pov = clamp(val, -0x8000, 0x7fff); *po = cpu_to_le16(pov); } -- 2.7.4
next prev parent reply other threads:[~2018-06-18 10:41 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-18 10:29 [PATCH 0/3] sound/usb/line6: fix some styling issues Roman Sommer 2018-06-18 10:29 ` Roman Sommer 2018-06-18 10:29 ` [PATCH 1/3] sound/line6: checkpatch: fix block comment style Roman Sommer 2018-06-18 10:29 ` Roman Sommer 2018-06-18 11:21 ` Greg Kroah-Hartman 2018-06-18 11:21 ` Greg Kroah-Hartman 2018-06-18 11:56 ` Sommer, Roman 2018-06-18 10:29 ` [PATCH 2/3] sound/line6: unsigned -> unsigned int Roman Sommer 2018-06-18 10:29 ` Roman Sommer 2018-06-18 10:29 ` Roman Sommer [this message] 2018-06-18 10:29 ` [PATCH 3/3] sound/line6: add newline after declarations Roman Sommer 2018-06-18 10:39 ` [PATCH 0/3] sound/usb/line6: fix some styling issues Takashi Iwai 2018-06-18 11:57 ` Sommer, Roman 2018-06-18 12:04 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1529317779-15908-4-git-send-email-roman.sommer@fau.de \ --to=roman.sommer@fau.de \ --cc=alsa-devel@alsa-project.org \ --cc=bhumirks@gmail.com \ --cc=daniel.graefe@fau.de \ --cc=gregkh@linuxfoundation.org \ --cc=hmoller@uc.cl \ --cc=keescook@chromium.org \ --cc=kstewart@linuxfoundation.org \ --cc=linux-kernel@i4.cs.fau.de \ --cc=linux-kernel@vger.kernel.org \ --cc=o-takashi@sakamocchi.jp \ --cc=perex@perex.cz \ --cc=pombredanne@nexb.com \ --cc=soulsonceonfire@gmail.com \ --cc=tglx@linutronix.de \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.