[PATCH 00/10] platform/chrome: cros_ec: remove unused includes and switch to SPDX

[PATCH 00/10] platform/chrome: cros_ec: remove unused includes and switch to SPDX

[Enric Balletbo i Serra]

Hi,

After the patchset to move cros_ec sysfs attributes to its own drivers
[1], I'd like to do some cleanup and switch to the SPDX license on these
files. This patchset applies on top of [1] and can go through the
platform-chrome repository once [1] is applied.

Best regards,
  Enric

[1] https://lkml.org/lkml/2018/12/12/679

Enric Balletbo i Serra (10):
  platform/chrome: cros_ec_debugfs: remove unused includes
  platform/chrome: cros_ec_lightbar: remove unused includes
  platform/chrome: cros_ec_sysfs: remove unused includes
  platform/chrome: cros_ec_vbc: remove unused includes
  platform/chrome: cros_ec_lightbar: remove pr_fmt() define
  platform/chrome: cros_ec_sysfs: remove pr_fmt() define
  platform/chrome: cros_ec_debugfs: switch to SPDX identifier
  platform/chrome: cros_ec_lightbar: switch to SPDX identifier
  platform/chrome: cros_ec_sysfs: switch to SPDX identifier
  platform/chrome: cros_ec_vbc: switch to SPDX identifier

 drivers/platform/chrome/cros_ec_debugfs.c  | 27 +++----------------
 drivers/platform/chrome/cros_ec_lightbar.c | 31 +++-------------------
 drivers/platform/chrome/cros_ec_sysfs.c    | 31 +++-------------------
 drivers/platform/chrome/cros_ec_vbc.c      | 28 +++++--------------
 4 files changed, 18 insertions(+), 99 deletions(-)

-- 
2.20.1

[PATCH 01/10] platform/chrome: cros_ec_debugfs: remove unused includes

[Enric Balletbo i Serra]

None of these are required at the moment.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_debugfs.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 6cacac53dfce..5e0039509368 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -19,17 +19,12 @@
 
 #include <linux/circ_buf.h>
 #include <linux/debugfs.h>
-#include <linux/delay.h>
-#include <linux/fs.h>
 #include <linux/mfd/cros_ec.h>
-#include <linux/mfd/cros_ec_commands.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/poll.h>
-#include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/wait.h>
 
 #define DRV_NAME "cros-ec-debugfs"
 
-- 
2.20.1

[PATCH 02/10] platform/chrome: cros_ec_lightbar: remove unused includes

[Enric Balletbo i Serra]

None of these are required at the moment.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_lightbar.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index c3e4e6e5211d..cc2f386a59f0 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -20,17 +20,10 @@
 #define pr_fmt(fmt) "cros_ec_lightbar: " fmt
 
 #include <linux/ctype.h>
-#include <linux/delay.h>
-#include <linux/device.h>
 #include <linux/fs.h>
-#include <linux/kobject.h>
 #include <linux/mfd/cros_ec.h>
-#include <linux/mfd/cros_ec_commands.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/uaccess.h>
 #include <linux/slab.h>
 
 #define DRV_NAME "cros-ec-lightbar"
-- 
2.20.1

[PATCH 03/10] platform/chrome: cros_ec_sysfs: remove unused includes

[Enric Balletbo i Serra]

None of these are required at the moment.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_sysfs.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index 0ff5aa30c070..3d1c1a7415a8 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -20,19 +20,12 @@
 #define pr_fmt(fmt) "cros_ec_sysfs: " fmt
 
 #include <linux/ctype.h>
-#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/fs.h>
-#include <linux/kobject.h>
 #include <linux/mfd/cros_ec.h>
-#include <linux/mfd/cros_ec_commands.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/printk.h>
 #include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/types.h>
-#include <linux/uaccess.h>
 
 #define DRV_NAME "cros-ec-sysfs"
 
-- 
2.20.1

[PATCH 04/10] platform/chrome: cros_ec_vbc: remove unused includes

[Enric Balletbo i Serra]

None of these are required at the moment.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_vbc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
index af9bfe6f385c..86903bc31b27 100644
--- a/drivers/platform/chrome/cros_ec_vbc.c
+++ b/drivers/platform/chrome/cros_ec_vbc.c
@@ -18,10 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/cros_ec.h>
-#include <linux/mfd/cros_ec_commands.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
-- 
2.20.1

[PATCH 05/10] platform/chrome: cros_ec_lightbar: remove pr_fmt() define

[Enric Balletbo i Serra]

This driver no longer has any pr_{level} messages. Remove the pr_fmt().

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_lightbar.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index cc2f386a59f0..4211a26587d3 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define pr_fmt(fmt) "cros_ec_lightbar: " fmt
-
 #include <linux/ctype.h>
 #include <linux/fs.h>
 #include <linux/mfd/cros_ec.h>
-- 
2.20.1

[PATCH 06/10] platform/chrome: cros_ec_sysfs: remove pr_fmt() define

[Enric Balletbo i Serra]

This driver no longer has any pr_{level} messages. Remove the pr_fmt().

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_sysfs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index 3d1c1a7415a8..c502c0f52092 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define pr_fmt(fmt) "cros_ec_sysfs: " fmt
-
 #include <linux/ctype.h>
 #include <linux/device.h>
 #include <linux/fs.h>
-- 
2.20.1

[PATCH 07/10] platform/chrome: cros_ec_debugfs: switch to SPDX identifier

[Enric Balletbo i Serra]

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_debugfs.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 5e0039509368..204738ff6338 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_debugfs - debug logs for Chrome OS EC
- *
- * Copyright 2015 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Debug logs for the ChromeOS EC
+//
+// Copyright (C) 2015 Google, Inc.
 
 #include <linux/circ_buf.h>
 #include <linux/debugfs.h>
-- 
2.20.1

[PATCH 08/10] platform/chrome: cros_ec_lightbar: switch to SPDX identifier

[Enric Balletbo i Serra]

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_lightbar.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index 4211a26587d3..596b899e5508 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_lightbar - expose the Chromebook Pixel lightbar to userspace
- *
- * Copyright (C) 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the Chromebook Pixel lightbar to userspace
+//
+// Copyright (C) 2014 Google, Inc.
 
 #include <linux/ctype.h>
 #include <linux/fs.h>
-- 
2.20.1

[PATCH 09/10] platform/chrome: cros_ec_sysfs: switch to SPDX identifier

[Enric Balletbo i Serra]

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_sysfs.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index c502c0f52092..c2dd253567ec 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_sysfs - expose the Chrome OS EC through sysfs
- *
- * Copyright (C) 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the ChromeOS EC through sysfs
+//
+// Copyright (C) 2014 Google, Inc.
 
 #include <linux/ctype.h>
 #include <linux/device.h>
-- 
2.20.1

[PATCH 10/10] platform/chrome: cros_ec_vbc: switch to SPDX identifier

[Enric Balletbo i Serra]

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

 drivers/platform/chrome/cros_ec_vbc.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
index 86903bc31b27..63f451f85d8d 100644
--- a/drivers/platform/chrome/cros_ec_vbc.c
+++ b/drivers/platform/chrome/cros_ec_vbc.c
@@ -1,22 +1,8 @@
-/*
- * cros_ec_vbc - Expose the vboot context nvram to userspace
- *
- * Copyright (C) 2015 Collabora Ltd.
- *
- * based on vendor driver,
- *
- * Copyright (C) 2012 The Chromium OS Authors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the vboot context nvram to userspace
+//
+// Copyright (C) 2012 Google, Inc.
+// Copyright (C) 2015 Collabora Ltd.
 
 #include <linux/platform_device.h>
 #include <linux/mfd/cros_ec.h>
-- 
2.20.1

Re: [PATCH 04/10] platform/chrome: cros_ec_vbc: remove unused includes

[Guenter Roeck]

On Tue, Jan 8, 2019 at 8:10 AM Enric Balletbo i Serra
<enric.balletbo@collabora.com> wrote:
>
> None of these are required at the moment.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>
>  drivers/platform/chrome/cros_ec_vbc.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
> index af9bfe6f385c..86903bc31b27 100644
> --- a/drivers/platform/chrome/cros_ec_vbc.c
> +++ b/drivers/platform/chrome/cros_ec_vbc.c
> @@ -18,10 +18,8 @@
>   * GNU General Public License for more details.
>   */
>
> -#include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/mfd/cros_ec.h>
> -#include <linux/mfd/cros_ec_commands.h>

It is customary to not rely on secondary includes. Yet, with this
removal, the code will rely on cros_ec.h including cros_ec_commands.h,
for the definition of EC_VBNV_CONTEXT_OP_READ. Does this really make
sense ?

[ I didn't check the other patches, but I suspect the same applies
there as well ]

Guenter

>  #include <linux/module.h>
>  #include <linux/slab.h>
>
> --
> 2.20.1
>

Re: [PATCH 04/10] platform/chrome: cros_ec_vbc: remove unused includes

[Enric Balletbo Serra]

Hi Guenter,

Missatge de Guenter Roeck <groeck@google.com> del dia dt., 8 de gen.
2019 a les 18:19:
>
> On Tue, Jan 8, 2019 at 8:10 AM Enric Balletbo i Serra
> <enric.balletbo@collabora.com> wrote:
> >
> > None of these are required at the moment.
> >
> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > ---
> >
> >  drivers/platform/chrome/cros_ec_vbc.c | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
> > index af9bfe6f385c..86903bc31b27 100644
> > --- a/drivers/platform/chrome/cros_ec_vbc.c
> > +++ b/drivers/platform/chrome/cros_ec_vbc.c
> > @@ -18,10 +18,8 @@
> >   * GNU General Public License for more details.
> >   */
> >
> > -#include <linux/of.h>
> >  #include <linux/platform_device.h>
> >  #include <linux/mfd/cros_ec.h>
> > -#include <linux/mfd/cros_ec_commands.h>
>
> It is customary to not rely on secondary includes. Yet, with this
> removal, the code will rely on cros_ec.h including cros_ec_commands.h,
> for the definition of EC_VBNV_CONTEXT_OP_READ. Does this really make
> sense ?
>

Ok, I didn't know that.

> [ I didn't check the other patches, but I suspect the same applies
> there as well ]
>

I'll recheck all the patches to make sure I only remove the includes
that are not needed.

Thanks,
  Enric

> Guenter
>
> >  #include <linux/module.h>
> >  #include <linux/slab.h>
> >
> > --
> > 2.20.1
> >