[1/9] staging: greybus: fix up SPDX comment in .h files
diff mbox series

Message ID 20190825055429.18547-2-gregkh@linuxfoundation.org
State Accepted
Commit baeeb02ccd704e3a6cdff95a78a41916e6a85b21
Headers show
Series
  • staging: move greybus core out of staging
Related show

Commit Message

Greg Kroah-Hartman Aug. 25, 2019, 5:54 a.m. UTC
When these files originally got an SPDX tag, I used // instead of /* */
for the .h files.  Fix this up to use // properly.

Cc: Viresh Kumar <vireshk@kernel.org>
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: greybus-dev@lists.linaro.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/greybus/firmware.h               | 2 +-
 drivers/staging/greybus/gb-camera.h              | 2 +-
 drivers/staging/greybus/gbphy.h                  | 2 +-
 drivers/staging/greybus/greybus.h                | 2 +-
 drivers/staging/greybus/greybus_authentication.h | 2 +-
 drivers/staging/greybus/greybus_firmware.h       | 2 +-
 drivers/staging/greybus/greybus_manifest.h       | 2 +-
 drivers/staging/greybus/greybus_protocols.h      | 2 +-
 drivers/staging/greybus/greybus_trace.h          | 2 +-
 drivers/staging/greybus/hd.h                     | 2 +-
 drivers/staging/greybus/interface.h              | 2 +-
 drivers/staging/greybus/manifest.h               | 2 +-
 drivers/staging/greybus/module.h                 | 2 +-
 drivers/staging/greybus/operation.h              | 2 +-
 drivers/staging/greybus/spilib.h                 | 2 +-
 drivers/staging/greybus/svc.h                    | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

Comments

Viresh Kumar Aug. 26, 2019, 5:51 a.m. UTC | #1
On 25-08-19, 07:54, Greg Kroah-Hartman wrote:
> When these files originally got an SPDX tag, I used // instead of /* */
> for the .h files.  Fix this up to use // properly.
> 
> Cc: Viresh Kumar <vireshk@kernel.org>
> Cc: Johan Hovold <johan@kernel.org>
> Cc: Alex Elder <elder@kernel.org>
> Cc: greybus-dev@lists.linaro.org
> Cc: devel@driverdev.osuosl.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/staging/greybus/firmware.h               | 2 +-
>  drivers/staging/greybus/gb-camera.h              | 2 +-
>  drivers/staging/greybus/gbphy.h                  | 2 +-
>  drivers/staging/greybus/greybus.h                | 2 +-
>  drivers/staging/greybus/greybus_authentication.h | 2 +-
>  drivers/staging/greybus/greybus_firmware.h       | 2 +-
>  drivers/staging/greybus/greybus_manifest.h       | 2 +-
>  drivers/staging/greybus/greybus_protocols.h      | 2 +-
>  drivers/staging/greybus/greybus_trace.h          | 2 +-
>  drivers/staging/greybus/hd.h                     | 2 +-
>  drivers/staging/greybus/interface.h              | 2 +-
>  drivers/staging/greybus/manifest.h               | 2 +-
>  drivers/staging/greybus/module.h                 | 2 +-
>  drivers/staging/greybus/operation.h              | 2 +-
>  drivers/staging/greybus/spilib.h                 | 2 +-
>  drivers/staging/greybus/svc.h                    | 2 +-
>  16 files changed, 16 insertions(+), 16 deletions(-)

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Greg Kroah-Hartman Aug. 27, 2019, 7:58 a.m. UTC | #2
On Mon, Aug 26, 2019 at 11:21:19AM +0530, Viresh Kumar wrote:
> On 25-08-19, 07:54, Greg Kroah-Hartman wrote:
> > When these files originally got an SPDX tag, I used // instead of /* */
> > for the .h files.  Fix this up to use // properly.
> > 
> > Cc: Viresh Kumar <vireshk@kernel.org>
> > Cc: Johan Hovold <johan@kernel.org>
> > Cc: Alex Elder <elder@kernel.org>
> > Cc: greybus-dev@lists.linaro.org
> > Cc: devel@driverdev.osuosl.org
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> >  drivers/staging/greybus/firmware.h               | 2 +-
> >  drivers/staging/greybus/gb-camera.h              | 2 +-
> >  drivers/staging/greybus/gbphy.h                  | 2 +-
> >  drivers/staging/greybus/greybus.h                | 2 +-
> >  drivers/staging/greybus/greybus_authentication.h | 2 +-
> >  drivers/staging/greybus/greybus_firmware.h       | 2 +-
> >  drivers/staging/greybus/greybus_manifest.h       | 2 +-
> >  drivers/staging/greybus/greybus_protocols.h      | 2 +-
> >  drivers/staging/greybus/greybus_trace.h          | 2 +-
> >  drivers/staging/greybus/hd.h                     | 2 +-
> >  drivers/staging/greybus/interface.h              | 2 +-
> >  drivers/staging/greybus/manifest.h               | 2 +-
> >  drivers/staging/greybus/module.h                 | 2 +-
> >  drivers/staging/greybus/operation.h              | 2 +-
> >  drivers/staging/greybus/spilib.h                 | 2 +-
> >  drivers/staging/greybus/svc.h                    | 2 +-
> >  16 files changed, 16 insertions(+), 16 deletions(-)
> 
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

Thanks for all of the acks!

greg k-h
Gao Xiang Aug. 27, 2019, 9:20 a.m. UTC | #3
Hi Greg,

On Tue, Aug 27, 2019 at 09:58:02AM +0200, Greg Kroah-Hartman wrote:
> On Mon, Aug 26, 2019 at 11:21:19AM +0530, Viresh Kumar wrote:
> > On 25-08-19, 07:54, Greg Kroah-Hartman wrote:
> > > When these files originally got an SPDX tag, I used // instead of /* */
> > > for the .h files.  Fix this up to use // properly.
> > > 
> > > Cc: Viresh Kumar <vireshk@kernel.org>
> > > Cc: Johan Hovold <johan@kernel.org>
> > > Cc: Alex Elder <elder@kernel.org>
> > > Cc: greybus-dev@lists.linaro.org
> > > Cc: devel@driverdev.osuosl.org
> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > ---
> > >  drivers/staging/greybus/firmware.h               | 2 +-
> > >  drivers/staging/greybus/gb-camera.h              | 2 +-
> > >  drivers/staging/greybus/gbphy.h                  | 2 +-
> > >  drivers/staging/greybus/greybus.h                | 2 +-
> > >  drivers/staging/greybus/greybus_authentication.h | 2 +-
> > >  drivers/staging/greybus/greybus_firmware.h       | 2 +-
> > >  drivers/staging/greybus/greybus_manifest.h       | 2 +-
> > >  drivers/staging/greybus/greybus_protocols.h      | 2 +-
> > >  drivers/staging/greybus/greybus_trace.h          | 2 +-
> > >  drivers/staging/greybus/hd.h                     | 2 +-
> > >  drivers/staging/greybus/interface.h              | 2 +-
> > >  drivers/staging/greybus/manifest.h               | 2 +-
> > >  drivers/staging/greybus/module.h                 | 2 +-
> > >  drivers/staging/greybus/operation.h              | 2 +-
> > >  drivers/staging/greybus/spilib.h                 | 2 +-
> > >  drivers/staging/greybus/svc.h                    | 2 +-
> > >  16 files changed, 16 insertions(+), 16 deletions(-)
> > 
> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> 
> Thanks for all of the acks!
> 
> greg k-h

I found similar issues of graybus when I tested the latest staging-testing

In file included from <command-line>:0:0:
./include/linux/greybus/greybus_protocols.h:45:2: error: unknown type name ‘__le16’
  __le16 size;  /* Size in bytes of header + payload */
  ^~~~~~
./include/linux/greybus/greybus_protocols.h:46:2: error: unknown type name ‘__le16’
  __le16 operation_id; /* Operation unique id */
  ^~~~~~
./include/linux/greybus/greybus_protocols.h:47:2: error: unknown type name ‘__u8’
  __u8 type;  /* E.g GB_I2C_TYPE_* or GB_GPIO_TYPE_* */
  ^~~~
./include/linux/greybus/greybus_protocols.h:48:2: error: unknown type name ‘__u8’
  __u8 result;  /* Result of request (in responses only) */
  ^~~~
./include/linux/greybus/greybus_protocols.h:49:2: error: unknown type name ‘__u8’
  __u8 pad[2];  /* must be zero (ignore when read) */
  ^~~~
./include/linux/greybus/greybus_protocols.h:58:2: error: unknown type name ‘__u8’
  __u8 phase;
  ^~~~
./include/linux/greybus/greybus_protocols.h:88:2: error: unknown type name ‘__u8’
  __u8 major;
  ^~~~
./include/linux/greybus/greybus_protocols.h:89:2: error: unknown type name ‘__u8’
  __u8 minor;
  ^~~~
./include/linux/greybus/greybus_protocols.h:93:2: error: unknown type name ‘__u8’
  __u8 major;
  ^~~~
./include/linux/greybus/greybus_protocols.h:94:2: error: unknown type name ‘__u8’
  __u8 minor;
  ^~~~
./include/linux/greybus/greybus_protocols.h:98:2: error: unknown type name ‘__u8’
  __u8 bundle_id;
  ^~~~
./include/linux/greybus/greybus_protocols.h:102:2: error: unknown type name ‘__u8’
  __u8 major;
  ^~~~
./include/linux/greybus/greybus_protocols.h:103:2: error: unknown type name ‘__u8’
  __u8 minor;
  ^~~~
./include/linux/greybus/greybus_protocols.h:108:2: error: unknown type name ‘__le16’
  __le16   size;
  ^~~~~~
./include/linux/greybus/greybus_protocols.h:113:2: error: unknown type name ‘__u8’
  __u8   data[0];
  ^~~~
./include/linux/greybus/greybus_protocols.h:118:2: error: unknown type name ‘__le16’
  __le16   cport_id;
  ^~~~~~
./include/linux/greybus/greybus_protocols.h:122:2: error: unknown type name ‘__le16’
  __le16   cport_id;

.. and other files...

Not very sure... but it seems it can be observed with allmodconfig or
CONFIG_KERNEL_HEADER_TEST=y and fail my compilation...
Hope that of some help (kind reminder...)

Thanks,
Gao Xiang


> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Greg Kroah-Hartman Aug. 27, 2019, 3:43 p.m. UTC | #4
On Tue, Aug 27, 2019 at 05:20:36PM +0800, Gao Xiang wrote:
> Hi Greg,
> 
> On Tue, Aug 27, 2019 at 09:58:02AM +0200, Greg Kroah-Hartman wrote:
> > On Mon, Aug 26, 2019 at 11:21:19AM +0530, Viresh Kumar wrote:
> > > On 25-08-19, 07:54, Greg Kroah-Hartman wrote:
> > > > When these files originally got an SPDX tag, I used // instead of /* */
> > > > for the .h files.  Fix this up to use // properly.
> > > > 
> > > > Cc: Viresh Kumar <vireshk@kernel.org>
> > > > Cc: Johan Hovold <johan@kernel.org>
> > > > Cc: Alex Elder <elder@kernel.org>
> > > > Cc: greybus-dev@lists.linaro.org
> > > > Cc: devel@driverdev.osuosl.org
> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > ---
> > > >  drivers/staging/greybus/firmware.h               | 2 +-
> > > >  drivers/staging/greybus/gb-camera.h              | 2 +-
> > > >  drivers/staging/greybus/gbphy.h                  | 2 +-
> > > >  drivers/staging/greybus/greybus.h                | 2 +-
> > > >  drivers/staging/greybus/greybus_authentication.h | 2 +-
> > > >  drivers/staging/greybus/greybus_firmware.h       | 2 +-
> > > >  drivers/staging/greybus/greybus_manifest.h       | 2 +-
> > > >  drivers/staging/greybus/greybus_protocols.h      | 2 +-
> > > >  drivers/staging/greybus/greybus_trace.h          | 2 +-
> > > >  drivers/staging/greybus/hd.h                     | 2 +-
> > > >  drivers/staging/greybus/interface.h              | 2 +-
> > > >  drivers/staging/greybus/manifest.h               | 2 +-
> > > >  drivers/staging/greybus/module.h                 | 2 +-
> > > >  drivers/staging/greybus/operation.h              | 2 +-
> > > >  drivers/staging/greybus/spilib.h                 | 2 +-
> > > >  drivers/staging/greybus/svc.h                    | 2 +-
> > > >  16 files changed, 16 insertions(+), 16 deletions(-)
> > > 
> > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > 
> > Thanks for all of the acks!
> > 
> > greg k-h
> 
> I found similar issues of graybus when I tested the latest staging-testing
> 
> In file included from <command-line>:0:0:
> ./include/linux/greybus/greybus_protocols.h:45:2: error: unknown type name ‘__le16’
>   __le16 size;  /* Size in bytes of header + payload */
>   ^~~~~~
> ./include/linux/greybus/greybus_protocols.h:46:2: error: unknown type name ‘__le16’
>   __le16 operation_id; /* Operation unique id */
>   ^~~~~~
> ./include/linux/greybus/greybus_protocols.h:47:2: error: unknown type name ‘__u8’
>   __u8 type;  /* E.g GB_I2C_TYPE_* or GB_GPIO_TYPE_* */
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:48:2: error: unknown type name ‘__u8’
>   __u8 result;  /* Result of request (in responses only) */
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:49:2: error: unknown type name ‘__u8’
>   __u8 pad[2];  /* must be zero (ignore when read) */
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:58:2: error: unknown type name ‘__u8’
>   __u8 phase;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:88:2: error: unknown type name ‘__u8’
>   __u8 major;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:89:2: error: unknown type name ‘__u8’
>   __u8 minor;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:93:2: error: unknown type name ‘__u8’
>   __u8 major;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:94:2: error: unknown type name ‘__u8’
>   __u8 minor;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:98:2: error: unknown type name ‘__u8’
>   __u8 bundle_id;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:102:2: error: unknown type name ‘__u8’
>   __u8 major;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:103:2: error: unknown type name ‘__u8’
>   __u8 minor;
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:108:2: error: unknown type name ‘__le16’
>   __le16   size;
>   ^~~~~~
> ./include/linux/greybus/greybus_protocols.h:113:2: error: unknown type name ‘__u8’
>   __u8   data[0];
>   ^~~~
> ./include/linux/greybus/greybus_protocols.h:118:2: error: unknown type name ‘__le16’
>   __le16   cport_id;
>   ^~~~~~
> ./include/linux/greybus/greybus_protocols.h:122:2: error: unknown type name ‘__le16’
>   __le16   cport_id;
> 
> .. and other files...
> 
> Not very sure... but it seems it can be observed with allmodconfig or
> CONFIG_KERNEL_HEADER_TEST=y and fail my compilation...
> Hope that of some help (kind reminder...)

Ah, thank you so much for this, NOW that makes sense why I got that odd
kbuild warning that I could not figure out.

Let me go fix this up, thank you so much.

greg k-h
Gao Xiang Aug. 27, 2019, 4:01 p.m. UTC | #5
On Tue, Aug 27, 2019 at 05:43:43PM +0200, Greg Kroah-Hartman wrote:
> On Tue, Aug 27, 2019 at 05:20:36PM +0800, Gao Xiang wrote:
> > Hi Greg,
> > 
> > On Tue, Aug 27, 2019 at 09:58:02AM +0200, Greg Kroah-Hartman wrote:
> > > On Mon, Aug 26, 2019 at 11:21:19AM +0530, Viresh Kumar wrote:
> > > > On 25-08-19, 07:54, Greg Kroah-Hartman wrote:
> > > > > When these files originally got an SPDX tag, I used // instead of /* */
> > > > > for the .h files.  Fix this up to use // properly.
> > > > > 
> > > > > Cc: Viresh Kumar <vireshk@kernel.org>
> > > > > Cc: Johan Hovold <johan@kernel.org>
> > > > > Cc: Alex Elder <elder@kernel.org>
> > > > > Cc: greybus-dev@lists.linaro.org
> > > > > Cc: devel@driverdev.osuosl.org
> > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > ---
> > > > >  drivers/staging/greybus/firmware.h               | 2 +-
> > > > >  drivers/staging/greybus/gb-camera.h              | 2 +-
> > > > >  drivers/staging/greybus/gbphy.h                  | 2 +-
> > > > >  drivers/staging/greybus/greybus.h                | 2 +-
> > > > >  drivers/staging/greybus/greybus_authentication.h | 2 +-
> > > > >  drivers/staging/greybus/greybus_firmware.h       | 2 +-
> > > > >  drivers/staging/greybus/greybus_manifest.h       | 2 +-
> > > > >  drivers/staging/greybus/greybus_protocols.h      | 2 +-
> > > > >  drivers/staging/greybus/greybus_trace.h          | 2 +-
> > > > >  drivers/staging/greybus/hd.h                     | 2 +-
> > > > >  drivers/staging/greybus/interface.h              | 2 +-
> > > > >  drivers/staging/greybus/manifest.h               | 2 +-
> > > > >  drivers/staging/greybus/module.h                 | 2 +-
> > > > >  drivers/staging/greybus/operation.h              | 2 +-
> > > > >  drivers/staging/greybus/spilib.h                 | 2 +-
> > > > >  drivers/staging/greybus/svc.h                    | 2 +-
> > > > >  16 files changed, 16 insertions(+), 16 deletions(-)
> > > > 
> > > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > > 
> > > Thanks for all of the acks!
> > > 
> > > greg k-h
> > 
> > I found similar issues of graybus when I tested the latest staging-testing
> > 
> > In file included from <command-line>:0:0:
> > ./include/linux/greybus/greybus_protocols.h:45:2: error: unknown type name ??????_le16??????
> >   __le16 size;  /* Size in bytes of header + payload */
> >   ^~~~~~
> > ./include/linux/greybus/greybus_protocols.h:46:2: error: unknown type name ??????_le16??????
> >   __le16 operation_id; /* Operation unique id */
> >   ^~~~~~
> > ./include/linux/greybus/greybus_protocols.h:47:2: error: unknown type name ??????_u8??????
> >   __u8 type;  /* E.g GB_I2C_TYPE_* or GB_GPIO_TYPE_* */
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:48:2: error: unknown type name ??????_u8??????
> >   __u8 result;  /* Result of request (in responses only) */
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:49:2: error: unknown type name ??????_u8??????
> >   __u8 pad[2];  /* must be zero (ignore when read) */
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:58:2: error: unknown type name ??????_u8??????
> >   __u8 phase;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:88:2: error: unknown type name ??????_u8??????
> >   __u8 major;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:89:2: error: unknown type name ??????_u8??????
> >   __u8 minor;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:93:2: error: unknown type name ??????_u8??????
> >   __u8 major;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:94:2: error: unknown type name ??????_u8??????
> >   __u8 minor;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:98:2: error: unknown type name ??????_u8??????
> >   __u8 bundle_id;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:102:2: error: unknown type name ??????_u8??????
> >   __u8 major;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:103:2: error: unknown type name ??????_u8??????
> >   __u8 minor;
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:108:2: error: unknown type name ??????_le16??????
> >   __le16   size;
> >   ^~~~~~
> > ./include/linux/greybus/greybus_protocols.h:113:2: error: unknown type name ??????_u8??????
> >   __u8   data[0];
> >   ^~~~
> > ./include/linux/greybus/greybus_protocols.h:118:2: error: unknown type name ??????_le16??????
> >   __le16   cport_id;
> >   ^~~~~~
> > ./include/linux/greybus/greybus_protocols.h:122:2: error: unknown type name ??????_le16??????
> >   __le16   cport_id;
> > 
> > .. and other files...
> > 
> > Not very sure... but it seems it can be observed with allmodconfig or
> > CONFIG_KERNEL_HEADER_TEST=y and fail my compilation...
> > Hope that of some help (kind reminder...)
> 
> Ah, thank you so much for this, NOW that makes sense why I got that odd
> kbuild warning that I could not figure out.

Yeah, it seems KERNEL_HEADER_TEST is a new feature which aims at ensuring
kernel headers are self-contained... I think it can be observed by
  CONFIG_GREYBUS and CONFIG_KERNEL_HEADER_TEST are on

see commit 43c78d88036e ("kbuild: compile-test kernel headers to ensure they are self-contained")

> 
> Let me go fix this up, thank you so much.

You're welcome, I was just testing my previous patch after merging as well...

Thanks,
Gao Xiang

> 
> greg k-h

Patch
diff mbox series

diff --git a/drivers/staging/greybus/firmware.h b/drivers/staging/greybus/firmware.h
index 946221307ef6..72dfabfa4704 100644
--- a/drivers/staging/greybus/firmware.h
+++ b/drivers/staging/greybus/firmware.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Firmware Management Header
  *
diff --git a/drivers/staging/greybus/gb-camera.h b/drivers/staging/greybus/gb-camera.h
index ee293e461fc3..5fc469101fc1 100644
--- a/drivers/staging/greybus/gb-camera.h
+++ b/drivers/staging/greybus/gb-camera.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Camera protocol driver.
  *
diff --git a/drivers/staging/greybus/gbphy.h b/drivers/staging/greybus/gbphy.h
index 99463489d7d6..087928a586fb 100644
--- a/drivers/staging/greybus/gbphy.h
+++ b/drivers/staging/greybus/gbphy.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Bridged-Phy Bus driver
  *
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index d03ddb7c9df0..f0488ffff93e 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus driver and device API
  *
diff --git a/drivers/staging/greybus/greybus_authentication.h b/drivers/staging/greybus/greybus_authentication.h
index 03ea9615b217..d654760cf175 100644
--- a/drivers/staging/greybus/greybus_authentication.h
+++ b/drivers/staging/greybus/greybus_authentication.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * Greybus Component Authentication User Header
  *
diff --git a/drivers/staging/greybus/greybus_firmware.h b/drivers/staging/greybus/greybus_firmware.h
index b58281a63ba4..13ef3aa5279e 100644
--- a/drivers/staging/greybus/greybus_firmware.h
+++ b/drivers/staging/greybus/greybus_firmware.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * Greybus Firmware Management User Header
  *
diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h
index 2cec5cf7a846..db68f7e7d5a7 100644
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus manifest definition
  *
diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index ddc73f10eb22..7d649a7fc4c9 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/drivers/staging/greybus/greybus_trace.h b/drivers/staging/greybus/greybus_trace.h
index 7b5e2c6b1f6b..1bc9f1275c65 100644
--- a/drivers/staging/greybus/greybus_trace.h
+++ b/drivers/staging/greybus/greybus_trace.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus driver and device API
  *
diff --git a/drivers/staging/greybus/hd.h b/drivers/staging/greybus/hd.h
index 6cf024a20a58..348b76fabc9a 100644
--- a/drivers/staging/greybus/hd.h
+++ b/drivers/staging/greybus/hd.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Host Device
  *
diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index 1c00c5bb3ec9..8fb1eacda302 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Interface Block code
  *
diff --git a/drivers/staging/greybus/manifest.h b/drivers/staging/greybus/manifest.h
index f3c95a255631..88aa7e44cad5 100644
--- a/drivers/staging/greybus/manifest.h
+++ b/drivers/staging/greybus/manifest.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus manifest parsing
  *
diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h
index b1ebcc6636db..2a27e520ee94 100644
--- a/drivers/staging/greybus/module.h
+++ b/drivers/staging/greybus/module.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus Module code
  *
diff --git a/drivers/staging/greybus/operation.h b/drivers/staging/greybus/operation.h
index 40b7b02fff88..17ba3daf111b 100644
--- a/drivers/staging/greybus/operation.h
+++ b/drivers/staging/greybus/operation.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus operations
  *
diff --git a/drivers/staging/greybus/spilib.h b/drivers/staging/greybus/spilib.h
index 043d4d32c3ee..9d416839e3be 100644
--- a/drivers/staging/greybus/spilib.h
+++ b/drivers/staging/greybus/spilib.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus SPI library header
  *
diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h
index ad01783bac9c..e7452057cfe4 100644
--- a/drivers/staging/greybus/svc.h
+++ b/drivers/staging/greybus/svc.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Greybus SVC code
  *