From patchwork Wed Jan 18 07:48:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 45084 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2212179wrn; Wed, 18 Jan 2023 00:28:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsaaDXS+qES8O7FXsclL0dCoMfb7GmSUsDiRdMxnzO1E1KB8Yt6PxyQi/Py88uV52GzDsYe X-Received: by 2002:a05:6a00:1755:b0:58d:ae6e:836d with SMTP id j21-20020a056a00175500b0058dae6e836dmr6452329pfc.33.1674030513370; Wed, 18 Jan 2023 00:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674030513; cv=none; d=google.com; s=arc-20160816; b=z8dSyf4v0HDzhIJYYiYDEBryPoDCkE7/B9f0dqY+qK5pwzirJpXLzCCBc5ZLcqzagm ewG0VEqiohb+PUpWupFQlctsOtxpvYWM9s6yo8FZq509YrKs1+8KHDdf/hFh0bheEeAd 38s5JqpLjhggDzKfmd4dDoC0xyQ/PcgeyKtRqPPuAqGttkm197UFA4ojhVtM6SOxc8GR YRpWfXVDtoDeACTWHnpdoTQ93D4dCknVfvLri6uSRD+T0+wRHUZsKigYatT3RuAI+4r9 5rjwUTH8PSvrASnQjaEuyP2KbKC70uvtU5StbTorRKL1lMaJWFZfhnDU8SCJhB2ceA+f +4Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=dpNn0ZH9q6vD7sL6p1upr1L+8IzOkTQ5QhScoxRsX9k=; b=blZRzhmZmgISeWJ9hWO704QqOm9Kdz3JssfLUTVvBDDfSJI/+smfluDmOw4tuDsEMd kHT2NZ7Y2Bovv2mDrM7TQ8tv9aXSUkScahFPIU1ZG0yYNyISLGRrS7O2bPfhn4MyhPqK Frly11GZv2wtdy1n7v9V961JDF3xGvpg2EVX80FQNIv8fEVNwuTVTpf0tCh9CgXyPlzT maJ554Hu3+VgI/ouFu/6OhG9dboxjfFMtPi1h/NYmPa/OTkAP33eLfoLU6lPzogedu0k VULMOOY6gUbVF49UOiXwmBG3y3z/mRkgzncmXSWn3fr13J8OP5qKL3FQd+3+VSVTyc5h d1Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TLGw42hm; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b4-20020a056a00114400b00577c17000dasi36300562pfm.166.2023.01.18.00.28.16; Wed, 18 Jan 2023 00:28:33 -0800 (PST) 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=@intel.com header.s=Intel header.b=TLGw42hm; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229483AbjARIVx (ORCPT + 99 others); Wed, 18 Jan 2023 03:21:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjARIUv (ORCPT ); Wed, 18 Jan 2023 03:20:51 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AE6839287; Tue, 17 Jan 2023 23:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674028092; x=1705564092; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=V0/TXsQQWmEebWydvXYOMJFyW5Ah/NfVrzP/l74ZXew=; b=TLGw42hmOomx4Kgw8pFfOylDAVbHoWz5bDL5iKv5qoDNSI8ncjiiK1Pc szgNu0PsfXTs2V+FGZ3XD+uKFXyp11NbUcADRJoGUWSrFh3lq6PJHRe5i Va3spuHAGPNNfHo01axByiqgzLn+g7NhX0fDIA9dwALx2P2MNKY3n1ITT tWysx8HzU+rBXDHtiS4JKsUpPVtG0Ps1KfAn2zxNVm0X0R9YysyHsr8SI ZttQwaDU2XkOzbEBZcgfQlRx1RCMmwPFGEVCqb2anXqpa7ssEr/xKZVVc mi0TNi1kjov7FLyfcEK97gLUZ1x1WpXaWbHFXpsj+/84Dqb7NK+5YcfOn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="312800645" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="312800645" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 23:48:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="637171941" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="637171941" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 17 Jan 2023 23:48:07 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id ECF4B256; Wed, 18 Jan 2023 09:48:42 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko Subject: [PATCH v1 1/2] iio: core: Replace iio_sysfs_match_string_with_gaps() by __sysfs_match_string() Date: Wed, 18 Jan 2023 09:48:27 +0200 Message-Id: <20230118074828.66155-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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?1755348219465918418?= X-GMAIL-MSGID: =?utf-8?q?1755348219465918418?= None of the current users is using gaps in the list of the items. No need to have a specific function for that, just replace it by library available __sysfs_match_string(). Signed-off-by: Andy Shevchenko --- drivers/iio/industrialio-core.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 52e690f031cb..26e357f14db8 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -205,36 +205,6 @@ bool iio_buffer_enabled(struct iio_dev *indio_dev) } EXPORT_SYMBOL_GPL(iio_buffer_enabled); -/** - * iio_sysfs_match_string_with_gaps - matches given string in an array with gaps - * @array: array of strings - * @n: number of strings in the array - * @str: string to match with - * - * Returns index of @str in the @array or -EINVAL, similar to match_string(). - * Uses sysfs_streq instead of strcmp for matching. - * - * This routine will look for a string in an array of strings. - * The search will continue until the element is found or the n-th element - * is reached, regardless of any NULL elements in the array. - */ -static int iio_sysfs_match_string_with_gaps(const char * const *array, size_t n, - const char *str) -{ - const char *item; - int index; - - for (index = 0; index < n; index++) { - item = array[index]; - if (!item) - continue; - if (sysfs_streq(item, str)) - return index; - } - - return -EINVAL; -} - #if defined(CONFIG_DEBUG_FS) /* * There's also a CONFIG_DEBUG_FS guard in include/linux/iio/iio.h for @@ -569,7 +539,7 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev, if (!e->set) return -EINVAL; - ret = iio_sysfs_match_string_with_gaps(e->items, e->num_items, buf); + ret = __sysfs_match_string(e->items, e->num_items, buf); if (ret < 0) return ret; From patchwork Wed Jan 18 07:48:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 45083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2212166wrn; Wed, 18 Jan 2023 00:28:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXtvKtY03kc3iN4FBnnpYn3zKiCB1o+OFYN5S+4YO7x0CsPNRZYgK0vuXCZ2eqmveBLktM2B X-Received: by 2002:a05:6a00:124d:b0:58d:ee7c:6cca with SMTP id u13-20020a056a00124d00b0058dee7c6ccamr143800pfi.1.1674030511291; Wed, 18 Jan 2023 00:28:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674030511; cv=none; d=google.com; s=arc-20160816; b=IkvL0eOT1H5JZLE9eUMWNlY+wGO7iqyKvcj/hK9PfbXZokq10vfp3vPr+GSmNMc9S4 4Q3iKIrQgrg/lzAIG8bz2nBoXzzB0sBWqGH2wF9G8ym7iyaloLTl+igDrU9M+4n80Fed 7qfncyFQtvK6N19aCUm3vWU1xfTOQRLC8TSMVUqPwxvzuupmV/S8PCCUfOcFR0yN2KDZ mAgwYnKTsSc0sj6+0kSTwH5XA19fOhTLDeeOSVO7B8u+tfgSVyaQgtBsF5fP7PXEI3GH lCXI0DoPjhzHtlEDrVsXn2Clgv+f8tMIi9xomU8FY954aOm/G1GAQ00WOxFSa0+5hvJ4 jQ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pwpYNHxMgfFbnd5pdv4uDDXYW98Rf0/p33ED+3jlp1A=; b=xewl9bUs6il/2ixtEgEv/r3WJ/BWk72uYKzIKOl/DGbdK7SXPjR76v02HUWjXdz61S HYqIYYVD6lq78dFUJvnenQ2TVYFLCf3IDgxpvPovS/qWw2zA6IfEkDB6qozCAmz3A6tH PLyl0iWHlGTwIjVE4UJifECB006s0EaEkQyP9q3o6qzdxOf3d5bFNzXT1Zj4fi1v3ygO cAch5Dxl9EVeVVc70snpEx7BmOPosb9zXmd48pqU6bNUQGVzMKTwV/0q/81nMwb/BPrd VH5Uiv8WfxnqN9mAaHFThrv2Z1gkUkSq5TS8MN6AoNG7D82fshAiSLf7dZmGzmsY/2HG 4rrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Rti2eXE9; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b4-20020a056a00114400b00577c17000dasi36300561pfm.166.2023.01.18.00.28.15; Wed, 18 Jan 2023 00:28:31 -0800 (PST) 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=@intel.com header.s=Intel header.b=Rti2eXE9; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229894AbjARIVd (ORCPT + 99 others); Wed, 18 Jan 2023 03:21:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbjARIUv (ORCPT ); Wed, 18 Jan 2023 03:20:51 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7DC96F8B0; Tue, 17 Jan 2023 23:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674028090; x=1705564090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4xNa1gOUF5AxrOMYRZd3X+KrP42jd2ivX/meHUjRZ3o=; b=Rti2eXE9CYJtbLF0KjGkHg0yrrpzDr1m3H3EofXcCGDIvtlxsqLPE7Do H6ujt10loXWUPM+0xFLHsk8nuIzYH+L9KvXaENjPjMyexudghTJ9X6QS6 42P3ouywG2xtfYd1VXUfO2xsii/eHYtNap7o64uhkxmxDe2NCafhGKX4o Om1Nfpx0KknBZDNq424WcIx8VB1pFSc3RTDnhjBaoE9cPfkwFAPWG1Zpc S/PzTQVaTNl7kCl0tmMzzt7jSXpJAX1VyOqvgLYFqP49RPsI3khqq0P/E r0jYJ4GqsLsPyCQoQ9bZBaL6SzHS+bn5NRuHU4jJ4Quh9KQfqC4aTrv/c g==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="312800650" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="312800650" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 23:48:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="637171942" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="637171942" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 17 Jan 2023 23:48:07 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 03C947C; Wed, 18 Jan 2023 09:48:42 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko Subject: [PATCH v1 2/2] iio: core: Sort headers Date: Wed, 18 Jan 2023 09:48:28 +0200 Message-Id: <20230118074828.66155-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118074828.66155-1-andriy.shevchenko@linux.intel.com> References: <20230118074828.66155-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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?1755348217360524022?= X-GMAIL-MSGID: =?utf-8?q?1755348217360524022?= Sort the headers in alphabetic order in order to ease the maintenance for this part. Signed-off-by: Andy Shevchenko --- drivers/iio/industrialio-core.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 26e357f14db8..c117f50d0cf3 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -8,30 +8,32 @@ #define pr_fmt(fmt) "iio-core: " fmt -#include -#include -#include -#include -#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include -#include +#include + +#include +#include +#include #include +#include +#include + #include "iio_core.h" #include "iio_core_trigger.h" -#include -#include -#include -#include /* IDA to assign each registered device a unique id */ static DEFINE_IDA(iio_ida);