From patchwork Sat Apr 1 17:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 78159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1361593vqo; Sat, 1 Apr 2023 11:02:00 -0700 (PDT) X-Google-Smtp-Source: AKy350YMrOh91UfKgszpxlG9r+ZaBrXEZiaLW8YVLw8CLFuV9Srw0wo2iHzdNLyiKksWp1BVY3o8 X-Received: by 2002:a17:906:dffb:b0:92f:de0c:c914 with SMTP id lc27-20020a170906dffb00b0092fde0cc914mr30175490ejc.28.1680372120363; Sat, 01 Apr 2023 11:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680372120; cv=none; d=google.com; s=arc-20160816; b=SiRTVdlUTWjpavFdwuXOWuqgSU1YVZXWoZgKZNgAJcZmFBr+f28sjtZYXlB+EWgZPB BFXMcAj2he1ebsBWK7eWiOBpQGigzrs7Xqardnmhcn16TayP+ei0KZVc8OiIb+MVwLUQ hWELWB5DWfRts51Q0aAcvI/yJpqj+NStPuxl6D8If2uMrUAcqrro9m7JXrNOJSAR5ahy V92VMQ3AoqVYbo5WyqKmKJhGIuuVRqUKIK7hmcuszABe3c2Fpi5srpUTToompzGu251l iayN1JnNw6NOl8QnqMHLCyS+s6qVsGF/xABzD4nabt8Egam5LZAeJXM8o2zb7GXcNaat MYfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=uUk473gkjGgeA+vrTjspm7ZOU1tv85Lj1DyviVq1tIM=; b=s7oCu+Fq7YbZiXf9ZYJEQ/a32VEniUxGl6Neemr7agcgsLkpYNF6qckJbDYY5x7q9L dftgVAQZ7y8VrTrklpNw7VfZsXxX0f4xN9tCt5wRPuyDoAUMfOJhmMm3ZWEC2OdjT9Rv sNBg3HUR6Nqzj5qIrD/Z4zheSfkChjRxEzfe6HkempIr/US8YBdYTVogww3QoMb1gmSK ApluDeqUsIGmFFL4OQA0nBhwTt36vGyXs/BOvS6p6XnDkLZo4+ySaV0M0/kLHpQOUIh7 r89WHSg04jH95W8m4iHhz1Ujq4wlMxatQ63fGxrL3xq41JEJN45Qp6XljY4XTKBWgRwb /qBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V15yo1ag; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v27-20020a170906381b00b00930d74e55c3si777908ejc.824.2023.04.01.11.01.36; Sat, 01 Apr 2023 11:02:00 -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; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V15yo1ag; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229976AbjDARsL (ORCPT + 99 others); Sat, 1 Apr 2023 13:48:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229626AbjDARsK (ORCPT ); Sat, 1 Apr 2023 13:48:10 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E474CDE2 for ; Sat, 1 Apr 2023 10:48:09 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id ew6so101904841edb.7 for ; Sat, 01 Apr 2023 10:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680371288; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=uUk473gkjGgeA+vrTjspm7ZOU1tv85Lj1DyviVq1tIM=; b=V15yo1agiL/f/jCBH1vAnC4upO7VVXPn1t4xtCG0U3fuURPgscayNelI9XTdr17e+U 5X7TdYnFqA0U/9T2md+S+SNi6p/jdy3kpe+AX28cxaoCYtbkQ+XJYcbja8qDHwZXFz/o /O7/7wW6zZbsrjTm9poE9ME/JpJuHvsCnDq5qEYxaVo+ane08jlS9RhZtBl4WN0kJGXu l+LRyz1gZ3sWpwwQyfbsu0xdamENwsqA9LqtzBGf2VI0Mff8LuuDaM3igZ4v24GodUSM unJAd6i/9kdld9DWnWp9dSaq8VQWZeXYf5PSsc0ls834hMb5vylKQYSVVI3dSfxZiPFB KdKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680371288; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uUk473gkjGgeA+vrTjspm7ZOU1tv85Lj1DyviVq1tIM=; b=OMCRMsSQJr7f55nW2mW5jJhHqLJWHFKw34DBA2BOeZuaxkdOjgb3AbjvgBeu33EhhE CeyKcA/+RyF3cklEBkhzy1/OPfDee9sNXmhGEDmtZrvVIlpDXukVtnez77+HOKrmlFAo 3PtMoJQXrYYlWisa2YC07q+BLjxtrNLqtTFJPslBQsSxJtEM0ippdz8hvnkH1kmLkX5K pe6wv07zzwOZouFt6Zs36kLLM2WMZrbVPsmS1XrCCKfbCgSdtmzNPsE4u7BVs3kSfA5x qp51rMAkHudlDW6CwqhI2U8u7oVFYPGXe+p3jxDzw+GG+aeXks/QhiON1BfAspg+DCNP z3cg== X-Gm-Message-State: AAQBX9eOOmK1hm+CHkC2nTI7aTlj3fzBuFpqIpiaNRXOiTxLTJzm2yu7 femFqVZrmMW5xP4mAmkh+LLSo1yzvg== X-Received: by 2002:a17:906:2759:b0:931:ad32:79ed with SMTP id a25-20020a170906275900b00931ad3279edmr28497694ejd.12.1680371287742; Sat, 01 Apr 2023 10:48:07 -0700 (PDT) Received: from p183 ([46.53.251.40]) by smtp.gmail.com with ESMTPSA id gx20-20020a1709068a5400b00931faf03db0sm2316217ejc.27.2023.04.01.10.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Apr 2023 10:48:07 -0700 (PDT) Date: Sat, 1 Apr 2023 20:48:05 +0300 From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] string: implement streq() Message-ID: <4b595ab9-238c-43a5-aba0-be5d6afc0f87@p183> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761997876642982049?= X-GMAIL-MSGID: =?utf-8?q?1761997876642982049?= Most of the time strcmp() is being used, strings are checked for equality. Add wrapper to relay such intent (it is shorter to type, too). Use if (streq(s, "s")) { } or if (!streq(s, "s")) { } Signed-off-by: Alexey Dobriyan --- drivers/clk/socfpga/clk-gate-a10.c | 2 -- drivers/clk/socfpga/clk.h | 1 - include/linux/string.h | 6 ++++++ scripts/dtc/dtc.h | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) --- a/drivers/clk/socfpga/clk-gate-a10.c +++ b/drivers/clk/socfpga/clk-gate-a10.c @@ -11,8 +11,6 @@ #include "clk.h" -#define streq(a, b) (strcmp((a), (b)) == 0) - #define to_socfpga_gate_clk(p) container_of(p, struct socfpga_gate_clk, hw.hw) /* SDMMC Group for System Manager defines */ --- a/drivers/clk/socfpga/clk.h +++ b/drivers/clk/socfpga/clk.h @@ -19,7 +19,6 @@ #define SOCFPGA_MAX_PARENTS 5 -#define streq(a, b) (strcmp((a), (b)) == 0) #define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \ ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0)) --- a/include/linux/string.h +++ b/include/linux/string.h @@ -47,6 +47,12 @@ extern size_t strlcat(char *, const char *, __kernel_size_t); #ifndef __HAVE_ARCH_STRCMP extern int strcmp(const char *,const char *); #endif + +static inline bool streq(const char *a, const char *b) +{ + return strcmp(a, b) == 0; +} + #ifndef __HAVE_ARCH_STRNCMP extern int strncmp(const char *,const char *,__kernel_size_t); #endif --- a/scripts/dtc/dtc.h +++ b/scripts/dtc/dtc.h @@ -88,7 +88,11 @@ static inline uint64_t dtb_ld64(const void *p) | bp[7]; } -#define streq(a, b) (strcmp((a), (b)) == 0) +static inline bool streq(const char *a, const char *b) +{ + return strcmp(a, b) == 0; +} + #define strstarts(s, prefix) (strncmp((s), (prefix), strlen(prefix)) == 0) #define strprefixeq(a, n, b) (strlen(b) == (n) && (memcmp(a, b, n) == 0)) static inline bool strends(const char *str, const char *suffix)