From patchwork Sun Jun 4 05:36:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 102943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1986189vqr; Sat, 3 Jun 2023 22:39:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64G1KrH78CnrrSbE/TzBYmYV7CfR94PKrd/YYa/NWx80aHw5PYcWMIfE9b1C6ZFKbqBmsP X-Received: by 2002:a05:6358:7205:b0:122:f22d:2a9b with SMTP id h5-20020a056358720500b00122f22d2a9bmr11422753rwa.10.1685857147110; Sat, 03 Jun 2023 22:39:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685857147; cv=none; d=google.com; s=arc-20160816; b=k2ukNJgZN7eIGh0Y0qy9mZ4L5UlgeVFERSjJvSfx75xUmbEf+BcovOJQOuhY4qv1ia 09DB2oG6WHniIAggw8wV5EBaZpQ/OxUcv2Dm03eDW3f5Zkl+C2YzMNpmwpp75/bQg2tv gZIu/3Z8Pou62QpMfIFHqJnEg6sl9fvkk88h1/y+EAJzamFXQI7IPEA6Q5tCBR40PLPF cDSUmUAk6M4Ugi0e1OqZf+TiHp8frSJ2XQINFZjpfWSe1Pz0z1l0Mu84RBMzufJEHGzT LLB4ig4HCJf/jLWgdxUWq7eIh4ypNw0QDbT4moovDQdRYD8aoWVaDKprlCXxyHu3B8sB g+OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=5dZLYoh+kqJ0QgOZt6Q7m69+ENBpgmS4PktiQYxQZcY=; b=FKd4gCF+pcOp2illSjL703G7G4E0XF3uW6GJrom03S2b0qfmbEWjaobr8LA17utOQE ifskegBp/2Yb/JnjzO7V5rVm9aA3tTWX5/KtjJfUOOO0ltYi5o1NLj69B8OdgBU1PUyA A1aXHtSSvihLcCZcdh6zczEgGo2DUAwJeD43mBOb4i1L72ZxympeZ/XxrEqy2V9DCI41 cv82+T2Kr8s9l1PP+4mHpYqf0jgQ4ATlFi9DAYs1boQ6rM5JMGjerTD4ij1JyZUFE6SK rRKGh+N8YEZTw2Wol6ovuGqsmkOk/qcM3XTSNzvhPWshfks81zqSTDDODLpwGSWaTJjk 8fdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pv4-20020a17090b3c8400b0025690f8610bsi5674576pjb.59.2023.06.03.22.38.53; Sat, 03 Jun 2023 22:39:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjFDFiJ (ORCPT + 99 others); Sun, 4 Jun 2023 01:38:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjFDFiH (ORCPT ); Sun, 4 Jun 2023 01:38:07 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F690CE; Sat, 3 Jun 2023 22:38:05 -0700 (PDT) X-QQ-mid: bizesmtp91t1685857075t2knx7k6 Received: from linux-lab-host.localdomain ( [61.141.77.49]) by bizesmtp.qq.com (ESMTP) with id ; Sun, 04 Jun 2023 13:37:54 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: qTKqCPEPPMCMusprEIJpvMeXnrP/Pg47ltBveugHl56AMUwpiPQN+dX7Bx1al hyQMy5WOb2iwGqbVG2Vee4E1CJKGTYaPVCKPKX8kD8/yo3tZ2rIeymiY72vSvRoMb27pNEG jbtc7RzZOGJhVxHVAMve+71tINCsEp/ZTion6ifg/TNLEPpYBd9LH/w5ADuQNFBURZosfvJ q84P945SwQwPVyJeqTGthznnJkaFBxh1lvZinTuthAASHZzYB5dxSii1VjZ0QNeeP5aptOE l4sRjOXi7m0tDtf6US/kKjuJkH4SfpZllHn8WRggB3P2ElsmPmnvGNtklXZjXmiFa11fK2N 83pqciJQiKSs3As+YWzh+KbdwYUfVOkVV+ojkfRpGAYNrxHTeuIvSLLAg2zfw== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1136455146398936182 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, thomas@t-8ch.de Subject: [PATCH 2/4] tools/nolibc: unistd.h: apply __syscall_ret() helper Date: Sun, 4 Jun 2023 13:36:20 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767749344017093995?= X-GMAIL-MSGID: =?utf-8?q?1767749344017093995?= get the return type automatically and use __syscall_ret() to shrink 4 code lines. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/unistd.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/include/nolibc/unistd.h b/tools/include/nolibc/unistd.h index 6773e83c16a0..e4e2b4c09771 100644 --- a/tools/include/nolibc/unistd.h +++ b/tools/include/nolibc/unistd.h @@ -56,14 +56,10 @@ int tcsetpgrp(int fd, pid_t pid) return ioctl(fd, TIOCSPGRP, &pid); } -#define _syscall(N, ...) \ -({ \ - int _ret = my_syscall##N(__VA_ARGS__); \ - if (_ret < 0) { \ - SET_ERRNO(-_ret); \ - _ret = -1; \ - } \ - _ret; \ +#define _syscall(N, ...) \ +({ \ + typeof(my_syscall##N(__VA_ARGS__)) _ret = my_syscall##N(__VA_ARGS__); \ + __syscall_ret(_ret); \ }) #define _sycall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0)