diff mbox series

[v2,32/32] scripts: kernel-doc: remove unnecesssary change wrt Linux

Message ID 20201201103502.4024573-33-pbonzini@redhat.com
State New
Headers show
Series kernel-doc: update from Linux 5.10 | expand

Commit Message

Paolo Bonzini Dec. 1, 2020, 10:35 a.m. UTC
A comment in kernel-doc mentions QEMU's qatomic_set macro, but since
this code originated in Linux we should just revert it and stay as close
to the kernel's copy of the script as possible.

The change was introduced (more or less unintentionally) in QEMU commit
commit d73415a31547, which did a global search-and-replace of QEMU's
atomic access macros.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/kernel-doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Dec. 2, 2020, 9:03 a.m. UTC | #1
On 12/1/20 11:35 AM, Paolo Bonzini wrote:
> A comment in kernel-doc mentions QEMU's qatomic_set macro, but since
> this code originated in Linux we should just revert it and stay as close
> to the kernel's copy of the script as possible.
> 
> The change was introduced (more or less unintentionally) in QEMU commit
> commit d73415a31547, which did a global search-and-replace of QEMU's
> atomic access macros.
> 
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  scripts/kernel-doc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Typo "unneces[s]sary" in subject.
Paolo Bonzini Dec. 2, 2020, 9:08 a.m. UTC | #2
On 02/12/20 10:03, Philippe Mathieu-Daudé wrote:
> On 12/1/20 11:35 AM, Paolo Bonzini wrote:
>> A comment in kernel-doc mentions QEMU's qatomic_set macro, but since
>> this code originated in Linux we should just revert it and stay as close
>> to the kernel's copy of the script as possible.
>>
>> The change was introduced (more or less unintentionally) in QEMU commit
>> commit d73415a31547, which did a global search-and-replace of QEMU's
>> atomic access macros.
>>
>> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>   scripts/kernel-doc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Typo "unneces[s]sary" in subject.

Oops...  I have already sent a pull request, but I'll fix it if a respin 
is needed.

Paolo
diff mbox series

Patch

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index b95bae3654..4b19851b2d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1758,7 +1758,7 @@  sub dump_function($$) {
     # If you mess with these regexps, it's a good idea to check that
     # the following functions' documentation still comes out right:
     # - parport_register_device (function pointer parameters)
-    # - qatomic_set (macro)
+    # - atomic_set (macro)
     # - pci_match_device, __copy_to_user (long return type)
 
     if ($define && $prototype =~ m/^()([a-zA-Z0-9_~:]+)\s+/) {