- Remove the "log-like" parts, following the same logic as the previous commit - Unify format - Add missing major contributors, including myself - Sort entries in order of first contribution (Creative comes last for optical reasons; they don't appear to have directly contributed anyway) Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> --- sound/pci/emu10k1/emu10k1.c | 4 +--- sound/pci/emu10k1/emu10k1_main.c | 8 +++----- sound/pci/emu10k1/emufx.c | 6 +++--- sound/pci/emu10k1/emumixer.c | 8 ++++---- sound/pci/emu10k1/emupcm.c | 5 ++++- sound/pci/emu10k1/emuproc.c | 7 ++++--- sound/pci/emu10k1/io.c | 4 ++++ sound/pci/emu10k1/timer.c | 2 ++ sound/pci/emu10k1/voice.c | 6 +++--- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 1a13c086e86c..ba8e5534e2df 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -2,9 +2,7 @@ /* * The driver for the EMU10K1 (SB Live!) based soundcards * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> - * - * Copyright (c) by James Courtier-Dutton <James@xxxxxxxxxxxxxxxxxxxx> - * Added support for Audigy 2 Value. + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> */ #include <linux/init.h> diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 529d0bba87da..d3a37d805fb2 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. - * Routines for control of EMU10K1 chips * - * Copyright (c) by James Courtier-Dutton <James@xxxxxxxxxxxxxx> - * Added support for Audigy 2 Value. - * Added EMU 1010 support. - * General bug fixes and enhancements. + * Routines for control of EMU10K1 chips */ #include <linux/sched.h> diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index e0ad339c5bbf..347141635604 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. - * Routines for effect processor FX8010 * - * Copyright (c) by James Courtier-Dutton <James@xxxxxxxxxxxxxx> - * Added EMU 1010 support. + * Routines for effect processor FX8010 */ #include <linux/pci.h> diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 6ff59c44da36..cb2b4e5553e7 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -2,12 +2,12 @@ /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx>, * Takashi Iwai <tiwai@xxxxxxx> + * Lee Revell <rlrevell@xxxxxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. - * Routines for control of EMU10K1 chips / mixer routines - * Multichannel PCM support Copyright (c) Lee Revell <rlrevell@xxxxxxxxxxx> * - * Copyright (c) by James Courtier-Dutton <James@xxxxxxxxxxxxxx> - * Added EMU 1010 support. + * Routines for control of EMU10K1 chips / mixer routines */ #include <linux/time.h> diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 7a1d448f0656..7f4c1b38d6ec 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1,9 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> + * Lee Revell <rlrevell@xxxxxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. + * * Routines for control of EMU10K1 chips / PCM routines - * Multichannel PCM support Copyright (c) Lee Revell <rlrevell@xxxxxxxxxxx> */ #include <linux/pci.h> diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 39b422297c70..2f80fd91017c 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> + * Lee Revell <rlrevell@xxxxxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. - * Routines for control of EMU10K1 chips / proc interface routines * - * Copyright (c) by James Courtier-Dutton <James@xxxxxxxxxxxxxx> - * Added EMU 1010 support. + * Routines for control of EMU10K1 chips / proc interface routines */ #include <linux/slab.h> diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 7e4483c5bd2a..74df2330015f 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> + * Lee Revell <rlrevell@xxxxxxxxxxx> + * James Courtier-Dutton <James@xxxxxxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> * Creative Labs, Inc. + * * Routines for control of EMU10K1 chips */ diff --git a/sound/pci/emu10k1/timer.c b/sound/pci/emu10k1/timer.c index 8798604e7f98..bb2478319361 100644 --- a/sound/pci/emu10k1/timer.c +++ b/sound/pci/emu10k1/timer.c @@ -2,6 +2,8 @@ /* * Copyright (c) by Lee Revell <rlrevell@xxxxxxxxxxx> * Clemens Ladisch <clemens@xxxxxxxxxx> + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> + * * Routines for control of EMU10K1 chips */ diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c index ffe87f359a0e..77fb5427aaed 100644 --- a/sound/pci/emu10k1/voice.c +++ b/sound/pci/emu10k1/voice.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela <perex@xxxxxxxx> - * Creative Labs, Inc. * Lee Revell <rlrevell@xxxxxxxxxxx> - * Routines for control of EMU10K1 chips - voice manager + * Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> + * Creative Labs, Inc. * - * Rewrote voice allocator for multichannel support - rlrevell 12/2004 + * Routines for control of EMU10K1 chips - voice manager */ #include <linux/time.h> -- 2.40.0.152.g15d061e6df