diff mbox

[1/4] ASoC: fsl_ssi: Switch to SPDX identifier

Message ID 1525132518-27663-1-git-send-email-festevam@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabio Estevam April 30, 2018, 11:55 p.m. UTC 
From: Fabio Estevam <fabio.estevam@nxp.com>

Adopt the SPDX license identifier headers to ease license compliance
management.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 sound/soc/fsl/fsl_ssi.c     | 57 +++++++++++++++++++++------------------------
 sound/soc/fsl/fsl_ssi.h     |  6 +----
 sound/soc/fsl/fsl_ssi_dbg.c | 18 ++++++--------
 3 files changed, 34 insertions(+), 47 deletions(-)

Comments

Timur Tabi May 1, 2018, 2:06 a.m. UTC | #1 
On 4/30/18 6:55 PM, Fabio Estevam wrote:
> +// SPDX-License-Identifier: GPL-2.0
> +//

I thought only the SPDX header is supposed to use // and the rest of the 
comment should still be /* */.

> - * Copyright 2007-2008 Freescale Semiconductor, Inc.

I don't think you're supposed to remove copyright statements.
Fabio Estevam May 1, 2018, 12:14 p.m. UTC | #2 
On Mon, Apr 30, 2018 at 11:06 PM, Timur Tabi <timur@tabi.org> wrote:
> On 4/30/18 6:55 PM, Fabio Estevam wrote:
>>
>> +// SPDX-License-Identifier: GPL-2.0
>> +//
>
>
> I thought only the SPDX header is supposed to use // and the rest of the
> comment should still be /* */.

I think Mark's preference is to switch all the initial comments to // style.

>
>> - * Copyright 2007-2008 Freescale Semiconductor, Inc.
>
>
> I don't think you're supposed to remove copyright statements.

You are right. It was not done on purpose. Will send a v2. Thanks
Mark Brown May 1, 2018, 8:51 p.m. UTC | #3 
On Tue, May 01, 2018 at 09:14:47AM -0300, Fabio Estevam wrote:
> On Mon, Apr 30, 2018 at 11:06 PM, Timur Tabi <timur@tabi.org> wrote:
> > On 4/30/18 6:55 PM, Fabio Estevam wrote:

> >> +// SPDX-License-Identifier: GPL-2.0
> >> +//

> > I thought only the SPDX header is supposed to use // and the rest of the
> > comment should still be /* */.

> I think Mark's preference is to switch all the initial comments to // style.

Yes.  It's more that only the SPDX header has a technical requirement to
use C++ style but when you mix and match the two in what's effectively
the same comment block it just looks messy.
diff mbox

Patch

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 1544166..0a64822 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1,34 +1,29 @@ 
-/*
- * Freescale SSI ALSA SoC Digital Audio Interface (DAI) driver
- *
- * Author: Timur Tabi <timur@freescale.com>
- *
- * Copyright 2007-2010 Freescale Semiconductor, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- *
- *
- * Some notes why imx-pcm-fiq is used instead of DMA on some boards:
- *
- * The i.MX SSI core has some nasty limitations in AC97 mode. While most
- * sane processor vendors have a FIFO per AC97 slot, the i.MX has only
- * one FIFO which combines all valid receive slots. We cannot even select
- * which slots we want to receive. The WM9712 with which this driver
- * was developed with always sends GPIO status data in slot 12 which
- * we receive in our (PCM-) data stream. The only chance we have is to
- * manually skip this data in the FIQ handler. With sampling rates different
- * from 48000Hz not every frame has valid receive data, so the ratio
- * between pcm data and GPIO status data changes. Our FIQ handler is not
- * able to handle this, hence this driver only works with 48000Hz sampling
- * rate.
- * Reading and writing AC97 registers is another challenge. The core
- * provides us status bits when the read register is updated with *another*
- * value. When we read the same register two times (and the register still
- * contains the same value) these status bits are not set. We work
- * around this by not polling these bits but only wait a fixed delay.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Freescale SSI ALSA SoC Digital Audio Interface (DAI) driver
+//
+// Author: Timur Tabi <timur@freescale.com>
+//
+// Copyright 2007-2010 Freescale Semiconductor, Inc.
+//
+// Some notes why imx-pcm-fiq is used instead of DMA on some boards:
+//
+// The i.MX SSI core has some nasty limitations in AC97 mode. While most
+// sane processor vendors have a FIFO per AC97 slot, the i.MX has only
+// one FIFO which combines all valid receive slots. We cannot even select
+// which slots we want to receive. The WM9712 with which this driver
+// was developed with always sends GPIO status data in slot 12 which
+// we receive in our (PCM-) data stream. The only chance we have is to
+// manually skip this data in the FIQ handler. With sampling rates different
+// from 48000Hz not every frame has valid receive data, so the ratio
+// between pcm data and GPIO status data changes. Our FIQ handler is not
+// able to handle this, hence this driver only works with 48000Hz sampling
+// rate.
+// Reading and writing AC97 registers is another challenge. The core
+// provides us status bits when the read register is updated with *another*
+// value. When we read the same register two times (and the register still
+// contains the same value) these status bits are not set. We work
+// around this by not polling these bits but only wait a fixed delay.
 
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index 18f8dd5..146981f 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -1,12 +1,8 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fsl_ssi.h - ALSA SSI interface for the Freescale MPC8610 and i.MX SoC
  *
  * Author: Timur Tabi <timur@freescale.com>
- *
- * Copyright 2007-2008 Freescale Semiconductor, Inc.  This file is licensed
- * under the terms of the GNU General Public License version 2.  This
- * program is licensed "as is" without any warranty of any kind, whether
- * express or implied.
  */
 
 #ifndef _MPC8610_I2S_H
diff --git a/sound/soc/fsl/fsl_ssi_dbg.c b/sound/soc/fsl/fsl_ssi_dbg.c
index 7aac63e..ddf2f64 100644
--- a/sound/soc/fsl/fsl_ssi_dbg.c
+++ b/sound/soc/fsl/fsl_ssi_dbg.c
@@ -1,14 +1,10 @@ 
-/*
- * Freescale SSI ALSA SoC Digital Audio Interface (DAI) debugging functions
- *
- * Copyright 2014 Markus Pargmann <mpa@pengutronix.de>, Pengutronix
- *
- * Splitted from fsl_ssi.c
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Freescale SSI ALSA SoC Digital Audio Interface (DAI) debugging functions
+//
+// Copyright 2014 Markus Pargmann <mpa@pengutronix.de>, Pengutronix
+//
+// Split from fsl_ssi.c
 
 #include <linux/debugfs.h>
 #include <linux/device.h>