Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gzlub-00082b-DC for mharc-grub-devel@gnu.org; Fri, 01 Mar 2019 12:25:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzluZ-00080b-9v for grub-devel@gnu.org; Fri, 01 Mar 2019 12:25:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzlni-0001ZL-Eq for grub-devel@gnu.org; Fri, 01 Mar 2019 12:18:23 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40423) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzlni-0001Yh-5I for grub-devel@gnu.org; Fri, 01 Mar 2019 12:18:22 -0500 Received: by mail-wr1-x441.google.com with SMTP id q1so26721879wrp.7 for ; Fri, 01 Mar 2019 09:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DPf7GfHmMcU4SL9BUEAMVwiouDwJufHgqCDQkh53+b8=; b=MxJuNUmnm0A71aYuEBYV59I3g0kmnTN5KVSnvrkSecQ3k4JhHobQIu22Kowzjzsazf Cw0gzLgMCkXcAbEh8+G9Kfuqov6J6MNefqbRVNft9SDpmH6+py6RFBLREIGzGGLV7SpI 7HGRGCdxF/u+0xep2pYjsJql7yUWnwlVm4/oXkVzN4L+/CU1jznbugzql5PSX/XX5lnB J+jSo0F8JY/7fctjWV2C5FYEGuRzE+2H48beV9py+AkYOv6k1Jl8h1/sEzdycwgybuRG U30Ju5MaVpC91Vkjj1NZ1AtUrC0qGn/OpR+x1YFdtRHRautJLK4qgu0ne4IidwL+PV0h 8rSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DPf7GfHmMcU4SL9BUEAMVwiouDwJufHgqCDQkh53+b8=; b=PkW7vrTscNBVIx/+aUZessVz9zbfIGydgPgPQF4Xeh6hq4NP1anDdia5Vq5qyl1wSf Ua7uck+kiyNzgwKwevbFm3/CunheWtDityRq3vhTucm0cSHbkMYkDh8uFaeufXizQMJh Dm0Y5+b0tZjre6wD+oQxBR1Oyue8rMj617qdo/e1xlHHVLDB4hoSmsKjyDkxiY4up93b DqWIC85ZLahImSi2hI9pXyfc/IS2p88jCb4M4dgKUO4O8EWaL6r1Qiy3i5vHq3FcuobC Rgqcj5GPvhHqHcNwOUCacLFjphT5ZI2bfOmvtjNpJGbhagd1s9qu3tzgib8OOlWUxMrG uDDQ== X-Gm-Message-State: APjAAAU6j7lEIFfbL4IB3EejPOVlNyXcB9xUqU/mnqP6/ucD0kc9GTt5 9bqJT3CAxAKafVCPfW8PHvwqTz27 X-Google-Smtp-Source: APXvYqwLcucOBalUCub097R+rj/E09P/DXmezQAiPEbU1G29oJuiZdDvTS3sT04fk5z0R2rR/rU+vg== X-Received: by 2002:adf:f4d0:: with SMTP id h16mr4353287wrp.103.1551460700484; Fri, 01 Mar 2019 09:18:20 -0800 (PST) Received: from izanagi.home.vikt0ry.com (112.red-81-47-147.staticip.rima-tde.net. [81.47.147.112]) by smtp.gmail.com with ESMTPSA id e193sm17963208wmg.18.2019.03.01.09.18.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 09:18:19 -0800 (PST) From: =?UTF-8?q?Jes=C3=BAs=20Di=C3=A9guez=20Fern=C3=A1ndez?= To: grub-devel@gnu.org Cc: =?UTF-8?q?Jes=C3=BAs=20Di=C3=A9guez=20Fern=C3=A1ndez?= Subject: [PATCH v2 1/2] Replace __asm__ __volatile__ with asm volatile. Date: Fri, 1 Mar 2019 18:17:41 +0100 Message-Id: <20190301171742.17396-1-jesusdf@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2019 17:25:28 -0000 In order to maintain the coding style consistency, it was requested to replace the methods that use __asm__ __volatile__ with asm volatile. Signed-off-by: Jesús Diéguez Fernández --- grub-core/efiemu/runtime/efiemu.c | 10 +++++----- grub-core/lib/i386/halt.c | 2 +- include/grub/arm/time.h | 2 +- include/grub/arm64/time.h | 2 +- include/grub/i386/io.h | 12 ++++++------ include/grub/i386/time.h | 2 +- include/grub/i386/tsc.h | 2 +- include/grub/x86_64/time.h | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/grub-core/efiemu/runtime/efiemu.c b/grub-core/efiemu/runtime/efiemu.c index d923e409f..5db1f347b 100644 --- a/grub-core/efiemu/runtime/efiemu.c +++ b/grub-core/efiemu/runtime/efiemu.c @@ -174,17 +174,17 @@ efiemu_memset (grub_uint8_t *a, grub_uint8_t b, grub_size_t n) static inline void write_cmos (grub_uint8_t addr, grub_uint8_t val) { - __asm__ __volatile__ ("outb %%al,$0x70\n" - "mov %%cl, %%al\n" - "outb %%al,$0x71": :"a" (addr), "c" (val)); + asm volatile ("outb %%al,$0x70\n" + "mov %%cl, %%al\n" + "outb %%al,$0x71": :"a" (addr), "c" (val)); } static inline grub_uint8_t read_cmos (grub_uint8_t addr) { grub_uint8_t ret; - __asm__ __volatile__ ("outb %%al, $0x70\n" - "inb $0x71, %%al": "=a"(ret) :"a" (addr)); + asm volatile ("outb %%al, $0x70\n" + "inb $0x71, %%al": "=a"(ret) :"a" (addr)); return ret; } diff --git a/grub-core/lib/i386/halt.c b/grub-core/lib/i386/halt.c index 9f8405494..2364fe4d7 100644 --- a/grub-core/lib/i386/halt.c +++ b/grub-core/lib/i386/halt.c @@ -66,7 +66,7 @@ grub_halt (void) #endif /* Disable interrupts. */ - __asm__ __volatile__ ("cli"); + asm volatile ("cli"); /* Bochs, QEMU, etc. Removed in newer QEMU releases. */ for (i = 0; i < sizeof (bochs_shutdown) - 1; i++) diff --git a/include/grub/arm/time.h b/include/grub/arm/time.h index 4128506cb..c5a685225 100644 --- a/include/grub/arm/time.h +++ b/include/grub/arm/time.h @@ -23,7 +23,7 @@ static __inline void grub_cpu_idle (void) { /* FIXME: this can't work until we handle interrupts. */ -/* __asm__ __volatile__ ("wfi"); */ +/* asm volatile ("wfi"); */ } #endif /* ! KERNEL_CPU_TIME_HEADER */ diff --git a/include/grub/arm64/time.h b/include/grub/arm64/time.h index 4128506cb..c5a685225 100644 --- a/include/grub/arm64/time.h +++ b/include/grub/arm64/time.h @@ -23,7 +23,7 @@ static __inline void grub_cpu_idle (void) { /* FIXME: this can't work until we handle interrupts. */ -/* __asm__ __volatile__ ("wfi"); */ +/* asm volatile ("wfi"); */ } #endif /* ! KERNEL_CPU_TIME_HEADER */ diff --git a/include/grub/i386/io.h b/include/grub/i386/io.h index ae12a3e3d..e9cd80957 100644 --- a/include/grub/i386/io.h +++ b/include/grub/i386/io.h @@ -28,7 +28,7 @@ grub_inb (unsigned short int port) { unsigned char _v; - __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port)); + asm volatile ("inb %w1,%0":"=a" (_v):"Nd" (port)); return _v; } @@ -37,7 +37,7 @@ grub_inw (unsigned short int port) { unsigned short _v; - __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port)); + asm volatile ("inw %w1,%0":"=a" (_v):"Nd" (port)); return _v; } @@ -46,27 +46,27 @@ grub_inl (unsigned short int port) { unsigned int _v; - __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port)); + asm volatile ("inl %w1,%0":"=a" (_v):"Nd" (port)); return _v; } static __inline void grub_outb (unsigned char value, unsigned short int port) { - __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port)); + asm volatile ("outb %b0,%w1": :"a" (value), "Nd" (port)); } static __inline void grub_outw (unsigned short int value, unsigned short int port) { - __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port)); + asm volatile ("outw %w0,%w1": :"a" (value), "Nd" (port)); } static __inline void grub_outl (unsigned int value, unsigned short int port) { - __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port)); + asm volatile ("outl %0,%w1": :"a" (value), "Nd" (port)); } #endif /* _SYS_IO_H */ diff --git a/include/grub/i386/time.h b/include/grub/i386/time.h index 842882cf2..4da5ae93c 100644 --- a/include/grub/i386/time.h +++ b/include/grub/i386/time.h @@ -23,7 +23,7 @@ static __inline void grub_cpu_idle (void) { /* FIXME: this can't work until we handle interrupts. */ -/* __asm__ __volatile__ ("hlt"); */ +/* asm volatile ("hlt"); */ } #endif /* ! KERNEL_CPU_TIME_HEADER */ diff --git a/include/grub/i386/tsc.h b/include/grub/i386/tsc.h index 324174ded..947e62fa1 100644 --- a/include/grub/i386/tsc.h +++ b/include/grub/i386/tsc.h @@ -46,7 +46,7 @@ grub_get_tsc (void) grub_cpuid (0,a,b,c,d); /* Read TSC value. We cannot use "=A", since this would use %rax on x86_64. */ - __asm__ __volatile__ ("rdtsc":"=a" (lo), "=d" (hi)); + asm volatile ("rdtsc":"=a" (lo), "=d" (hi)); return (((grub_uint64_t) hi) << 32) | lo; } diff --git a/include/grub/x86_64/time.h b/include/grub/x86_64/time.h index 842882cf2..4da5ae93c 100644 --- a/include/grub/x86_64/time.h +++ b/include/grub/x86_64/time.h @@ -23,7 +23,7 @@ static __inline void grub_cpu_idle (void) { /* FIXME: this can't work until we handle interrupts. */ -/* __asm__ __volatile__ ("hlt"); */ +/* asm volatile ("hlt"); */ } #endif /* ! KERNEL_CPU_TIME_HEADER */ -- 2.17.1