2019-06-04 11:21:11

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH] ocxl: do not use C++ style comments in uapi header

Linux kernel tolerates C++ style comments these days. Actually, the
SPDX License tags for .c files start with //.

On the other hand, uapi headers are written in more strict C, where
the C++ comment style is forbidden.

Signed-off-by: Masahiro Yamada <[email protected]>
---

include/uapi/misc/ocxl.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/uapi/misc/ocxl.h b/include/uapi/misc/ocxl.h
index 97937cfa3baa..6d29a60a896a 100644
--- a/include/uapi/misc/ocxl.h
+++ b/include/uapi/misc/ocxl.h
@@ -33,23 +33,23 @@ struct ocxl_ioctl_attach {
};

struct ocxl_ioctl_metadata {
- __u16 version; // struct version, always backwards compatible
+ __u16 version; /* struct version, always backwards compatible */

- // Version 0 fields
+ /* Version 0 fields */
__u8 afu_version_major;
__u8 afu_version_minor;
- __u32 pasid; // PASID assigned to the current context
+ __u32 pasid; /* PASID assigned to the current context */

- __u64 pp_mmio_size; // Per PASID MMIO size
+ __u64 pp_mmio_size; /* Per PASID MMIO size */
__u64 global_mmio_size;

- // End version 0 fields
+ /* End version 0 fields */

- __u64 reserved[13]; // Total of 16*u64
+ __u64 reserved[13]; /* Total of 16*u64 */
};

struct ocxl_ioctl_p9_wait {
- __u16 thread_id; // The thread ID required to wake this thread
+ __u16 thread_id; /* The thread ID required to wake this thread */
__u16 reserved1;
__u32 reserved2;
__u64 reserved3[3];
--
2.17.1


2019-06-04 11:55:00

by Frederic Barrat

[permalink] [raw]
Subject: Re: [PATCH] ocxl: do not use C++ style comments in uapi header



Le 04/06/2019 à 13:16, Masahiro Yamada a écrit :
> Linux kernel tolerates C++ style comments these days. Actually, the
> SPDX License tags for .c files start with //.
>
> On the other hand, uapi headers are written in more strict C, where
> the C++ comment style is forbidden.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---

Thanks!
Acked-by: Frederic Barrat <[email protected]>


>
> include/uapi/misc/ocxl.h | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/include/uapi/misc/ocxl.h b/include/uapi/misc/ocxl.h
> index 97937cfa3baa..6d29a60a896a 100644
> --- a/include/uapi/misc/ocxl.h
> +++ b/include/uapi/misc/ocxl.h
> @@ -33,23 +33,23 @@ struct ocxl_ioctl_attach {
> };
>
> struct ocxl_ioctl_metadata {
> - __u16 version; // struct version, always backwards compatible
> + __u16 version; /* struct version, always backwards compatible */
>
> - // Version 0 fields
> + /* Version 0 fields */
> __u8 afu_version_major;
> __u8 afu_version_minor;
> - __u32 pasid; // PASID assigned to the current context
> + __u32 pasid; /* PASID assigned to the current context */
>
> - __u64 pp_mmio_size; // Per PASID MMIO size
> + __u64 pp_mmio_size; /* Per PASID MMIO size */
> __u64 global_mmio_size;
>
> - // End version 0 fields
> + /* End version 0 fields */
>
> - __u64 reserved[13]; // Total of 16*u64
> + __u64 reserved[13]; /* Total of 16*u64 */
> };
>
> struct ocxl_ioctl_p9_wait {
> - __u16 thread_id; // The thread ID required to wake this thread
> + __u16 thread_id; /* The thread ID required to wake this thread */
> __u16 reserved1;
> __u32 reserved2;
> __u64 reserved3[3];
>

2019-06-04 12:16:43

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] ocxl: do not use C++ style comments in uapi header

On Tue, Jun 4, 2019 at 8:54 PM Frederic Barrat <[email protected]> wrote:
>
>
>
> Le 04/06/2019 à 13:16, Masahiro Yamada a écrit :
> > Linux kernel tolerates C++ style comments these days. Actually, the
> > SPDX License tags for .c files start with //.
> >
> > On the other hand, uapi headers are written in more strict C, where
> > the C++ comment style is forbidden.
> >
> > Signed-off-by: Masahiro Yamada <[email protected]>
> > ---
>
> Thanks!
> Acked-by: Frederic Barrat <[email protected]>
>

Please hold on this patch until
we get consensus about the C++ comment style.

Discussion just started here:
https://lore.kernel.org/patchwork/patch/1083801/


--
Best Regards
Masahiro Yamada

2019-06-05 06:18:34

by Andrew Donnellan

[permalink] [raw]
Subject: Re: [PATCH] ocxl: do not use C++ style comments in uapi header

On 4/6/19 10:12 pm, Masahiro Yamada wrote:
> On Tue, Jun 4, 2019 at 8:54 PM Frederic Barrat <[email protected]> wrote:
>>
>>
>>
>> Le 04/06/2019 à 13:16, Masahiro Yamada a écrit :
>>> Linux kernel tolerates C++ style comments these days. Actually, the
>>> SPDX License tags for .c files start with //.
>>>
>>> On the other hand, uapi headers are written in more strict C, where
>>> the C++ comment style is forbidden.
>>>
>>> Signed-off-by: Masahiro Yamada <[email protected]>
>>> ---
>>
>> Thanks!
>> Acked-by: Frederic Barrat <[email protected]>
>>
>
> Please hold on this patch until
> we get consensus about the C++ comment style.
>
> Discussion just started here:
> https://lore.kernel.org/patchwork/patch/1083801/

If you choose to proceed with this patch:

Acked-by: Andrew Donnellan <[email protected]>

--
Andrew Donnellan OzLabs, ADL Canberra
[email protected] IBM Australia Limited

2019-06-06 09:03:12

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] ocxl: do not use C++ style comments in uapi header

Hi Michael,

On Wed, Jun 5, 2019 at 3:18 PM Andrew Donnellan <[email protected]> wrote:
>
> On 4/6/19 10:12 pm, Masahiro Yamada wrote:
> > On Tue, Jun 4, 2019 at 8:54 PM Frederic Barrat <[email protected]> wrote:
> >>
> >>
> >>
> >> Le 04/06/2019 à 13:16, Masahiro Yamada a écrit :
> >>> Linux kernel tolerates C++ style comments these days. Actually, the
> >>> SPDX License tags for .c files start with //.
> >>>
> >>> On the other hand, uapi headers are written in more strict C, where
> >>> the C++ comment style is forbidden.
> >>>
> >>> Signed-off-by: Masahiro Yamada <[email protected]>
> >>> ---
> >>
> >> Thanks!
> >> Acked-by: Frederic Barrat <[email protected]>
> >>
> >
> > Please hold on this patch until
> > we get consensus about the C++ comment style.
> >
> > Discussion just started here:
> > https://lore.kernel.org/patchwork/patch/1083801/
>
> If you choose to proceed with this patch:
>
> Acked-by: Andrew Donnellan <[email protected]>

After some discussion,
the other one was applied to the media subsystem.

Please pick up this one with Frederic and Andrew's Ack.

Thanks.



--
Best Regards
Masahiro Yamada

2019-06-15 13:36:30

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] ocxl: do not use C++ style comments in uapi header

On Tue, 2019-06-04 at 11:16:32 UTC, Masahiro Yamada wrote:
> Linux kernel tolerates C++ style comments these days. Actually, the
> SPDX License tags for .c files start with //.
>
> On the other hand, uapi headers are written in more strict C, where
> the C++ comment style is forbidden.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> Acked-by: Frederic Barrat <[email protected]>
> Acked-by: Andrew Donnellan <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/2305ff225c0b1691ec2e93f3d6990e13

cheers