2019-07-28 16:47:49

by Masahiro Yamada

Subject: [PATCH] scsi: ch: add include guard to chio.h

Add a header include guard just in case.

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

include/uapi/linux/chio.h | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/uapi/linux/chio.h b/include/uapi/linux/chio.h
index 689fc93fafda..e1cad4c319ee 100644
--- a/include/uapi/linux/chio.h
+++ b/include/uapi/linux/chio.h
@@ -3,6 +3,9 @@
* ioctl interface for the scsi media changer driver
*/

+#ifndef _UAPI_LINUX_CHIO_H
+#define _UAPI_LINUX_CHIO_H
+
/* changer element types */
#define CHET_MT 0 /* media transport element (robot) */
#define CHET_ST 1 /* storage element (media slots) */
@@ -160,10 +163,4 @@ struct changer_set_voltag {
#define CHIOSVOLTAG _IOW('c',18,struct changer_set_voltag)
#define CHIOGVPARAMS _IOR('c',19,struct changer_vendor_params)

-/* ---------------------------------------------------------------------- */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
+#endif /* _UAPI_LINUX_CHIO_H */
--
2.17.1

2019-10-03 04:04:25

by Masahiro Yamada

Subject: Re: [PATCH] scsi: ch: add include guard to chio.h

Hi,

On Mon, Jul 29, 2019 at 1:47 AM Masahiro Yamada
<[email protected]> wrote:
>
> Add a header include guard just in case.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---

Ping?


> include/uapi/linux/chio.h | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/include/uapi/linux/chio.h b/include/uapi/linux/chio.h
> index 689fc93fafda..e1cad4c319ee 100644
> --- a/include/uapi/linux/chio.h
> +++ b/include/uapi/linux/chio.h
> @@ -3,6 +3,9 @@
> * ioctl interface for the scsi media changer driver
> */
>
> +#ifndef _UAPI_LINUX_CHIO_H
> +#define _UAPI_LINUX_CHIO_H
> +
> /* changer element types */
> #define CHET_MT 0 /* media transport element (robot) */
> #define CHET_ST 1 /* storage element (media slots) */
> @@ -160,10 +163,4 @@ struct changer_set_voltag {
> #define CHIOSVOLTAG _IOW('c',18,struct changer_set_voltag)
> #define CHIOGVPARAMS _IOR('c',19,struct changer_vendor_params)
>
> -/* ---------------------------------------------------------------------- */
> -
> -/*
> - * Local variables:
> - * c-basic-offset: 8
> - * End:
> - */
> +#endif /* _UAPI_LINUX_CHIO_H */
> --
> 2.17.1
>


--
Best Regards
Masahiro Yamada

2019-10-04 07:56:07

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ch: add include guard to chio.h

Masahiro,

>> Add a header include guard just in case.

Fine with me. Is it going through your tree or should I pick it up?

--
Martin K. Petersen Oracle Linux Engineering

2019-10-04 07:58:17

by Masahiro Yamada

Subject: Re: [PATCH] scsi: ch: add include guard to chio.h

Hi Martin,

On Fri, Oct 4, 2019 at 10:59 AM Martin K. Petersen
<[email protected]> wrote:
>
>
> Masahiro,
>
> >> Add a header include guard just in case.
>
> Fine with me. Is it going through your tree or should I pick it up?



Could you please apply it to your tree?

Thanks.

--
Best Regards
Masahiro Yamada

2019-10-10 02:35:00

by Martin K. Petersen

Subject: Re: [PATCH] scsi: ch: add include guard to chio.h

Masahiro,

>> Fine with me. Is it going through your tree or should I pick it up?
>
> Could you please apply it to your tree?

Applied to 5.5/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering