diff mbox series

[1/2] tools/virtio: remove stray characters

Message ID 20221128034347.990-2-dave@stgolabs.net
State New
Headers
Series tools/virtio: remove smp_read_barrier_depends() |

Commit Message

Davidlohr Bueso Nov. 28, 2022, 3:43 a.m. UTC 
  __read_once_size() is not a macro, remove those '/'s.

Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
---
 tools/virtio/ringtest/main.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Comments

Xuan Zhuo Nov. 28, 2022, 6:16 a.m. UTC | #1 
On Sun, 27 Nov 2022 19:43:46 -0800, Davidlohr Bueso <dave@stgolabs.net> wrote:
> __read_once_size() is not a macro, remove those '/'s.
>
> Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>

Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>

> ---
>  tools/virtio/ringtest/main.h | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tools/virtio/ringtest/main.h b/tools/virtio/ringtest/main.h
> index 6d1fccd3d86c..9ed09caa659e 100644
> --- a/tools/virtio/ringtest/main.h
> +++ b/tools/virtio/ringtest/main.h
> @@ -149,16 +149,16 @@ static inline void busy_wait(void)
>  static __always_inline
>  void __read_once_size(const volatile void *p, void *res, int size)
>  {
> -        switch (size) {                                                 \
> -        case 1: *(unsigned char *)res = *(volatile unsigned char *)p; break;              \
> -        case 2: *(unsigned short *)res = *(volatile unsigned short *)p; break;            \
> -        case 4: *(unsigned int *)res = *(volatile unsigned int *)p; break;            \
> -        case 8: *(unsigned long long *)res = *(volatile unsigned long long *)p; break;            \
> -        default:                                                        \
> -                barrier();                                              \
> -                __builtin_memcpy((void *)res, (const void *)p, size);   \
> -                barrier();                                              \
> -        }                                                               \
> +	switch (size) {
> +	case 1: *(unsigned char *)res = *(volatile unsigned char *)p; break;
> +	case 2: *(unsigned short *)res = *(volatile unsigned short *)p; break;
> +	case 4: *(unsigned int *)res = *(volatile unsigned int *)p; break;
> +	case 8: *(unsigned long long *)res = *(volatile unsigned long long *)p; break;
> +	default:
> +		barrier();
> +		__builtin_memcpy((void *)res, (const void *)p, size);
> +		barrier();
> +	}
>  }
>
>  static __always_inline void __write_once_size(volatile void *p, void *res, int size)
> --
> 2.38.1
>
> _______________________________________________
> Virtualization mailing list
> Virtualization@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/virtualization
diff mbox series

Patch

diff --git a/tools/virtio/ringtest/main.h b/tools/virtio/ringtest/main.h
index 6d1fccd3d86c..9ed09caa659e 100644
--- a/tools/virtio/ringtest/main.h
+++ b/tools/virtio/ringtest/main.h
@@ -149,16 +149,16 @@  static inline void busy_wait(void)
 static __always_inline
 void __read_once_size(const volatile void *p, void *res, int size)
 {
-        switch (size) {                                                 \
-        case 1: *(unsigned char *)res = *(volatile unsigned char *)p; break;              \
-        case 2: *(unsigned short *)res = *(volatile unsigned short *)p; break;            \
-        case 4: *(unsigned int *)res = *(volatile unsigned int *)p; break;            \
-        case 8: *(unsigned long long *)res = *(volatile unsigned long long *)p; break;            \
-        default:                                                        \
-                barrier();                                              \
-                __builtin_memcpy((void *)res, (const void *)p, size);   \
-                barrier();                                              \
-        }                                                               \
+	switch (size) {
+	case 1: *(unsigned char *)res = *(volatile unsigned char *)p; break;
+	case 2: *(unsigned short *)res = *(volatile unsigned short *)p; break;
+	case 4: *(unsigned int *)res = *(volatile unsigned int *)p; break;
+	case 8: *(unsigned long long *)res = *(volatile unsigned long long *)p; break;
+	default:
+		barrier();
+		__builtin_memcpy((void *)res, (const void *)p, size);
+		barrier();
+	}
 }
 
 static __always_inline void __write_once_size(volatile void *p, void *res, int size)