2024-02-15 09:48:59

by Pairman Guo

Subject: [PATCH] USBIP: Use fallthrough pseudo-keyword

Hi maintainers,

There is a usage of ``/* FALLTHRU */`` in a switch statement in main()
that have long been untouched. This patch replaced it with the
better and proper pseudo-keyword ``fallthrough;``.

Please merge if it is the case. Thank you in advance.

Signed-off-by: Pairman Guo <[email protected]>
---
tools/usb/usbip/src/usbip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c
index f7c7220d9..ddcafb5c7 100644
--- a/tools/usb/usbip/src/usbip.c
+++ b/tools/usb/usbip/src/usbip.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
case '?':
printf("usbip: invalid option\n");
/* Terminate after printing error */
- /* FALLTHRU */
+ fallthrough;
default:
usbip_usage();
goto out;
--
2.43.1

2024-02-15 10:17:08

by Greg Kroah-Hartman

Subject: Re: [PATCH] USBIP: Use fallthrough pseudo-keyword

On Thu, Feb 15, 2024 at 05:26:30PM +0800, Pairman Guo wrote:
> Hi maintainers,
>
> There is a usage of ``/* FALLTHRU */`` in a switch statement in main()
> that have long been untouched. This patch replaced it with the
> better and proper pseudo-keyword ``fallthrough;``.
>
> Please merge if it is the case. Thank you in advance.

This is not needed in a changelog text.

> Signed-off-by: Pairman Guo <[email protected]>
> ---
> tools/usb/usbip/src/usbip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c
> index f7c7220d9..ddcafb5c7 100644
> --- a/tools/usb/usbip/src/usbip.c
> +++ b/tools/usb/usbip/src/usbip.c
> @@ -165,7 +165,7 @@ int main(int argc, char *argv[])
> case '?':
> printf("usbip: invalid option\n");
> /* Terminate after printing error */
> - /* FALLTHRU */
> + fallthrough;

Did you compile this? This is userspace code, and as-such, I don't
think it has this keyword, does it?

thanks,

greg k-h

2024-02-16 07:58:14

by Pairman Guo

Subject: Re: Re: [PATCH] USBIP: Use fallthrough pseudo-keyword

On Thu, Feb 15, 2024 at 11:14:49 +0800, Greg KH wrote:
> This is not needed in a changelog text.

Thanks for telling. I'm new to lkml and still learning about the format.

> > tools/usb/usbip/src/usbip.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c
> > index f7c7220d9..ddcafb5c7 100644
> > --- a/tools/usb/usbip/src/usbip.c
> > +++ b/tools/usb/usbip/src/usbip.c
> > @@ -165,7 +165,7 @@ int main(int argc, char *argv[])
> > case '?':
> > printf("usbip: invalid option\n");
> > /* Terminate after printing error */
> > - /* FALLTHRU */
> > + fallthrough;
>
> Did you compile this? This is userspace code, and as-such, I don't
> think it has this keyword, does it?

I'm sorry for my hurrying. I ran ``make tools/usb`` with no warning or error,
so I sent this patch. Now it turns out ``make tools/usb`` doesn't cover
tools/usb/usbip. I tried again with ``./autogen.sh && ./configure && make``
and it indeed failed. Since usbip.c doesn't have any reference to
include/linux/compiler.h, it cannot use ``fallthrough``. Thanks again for
pointing out this error.

Thanks,

Pairman