From patchwork Thu Jul 20 20:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 123449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3385801vqt; Thu, 20 Jul 2023 14:19:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlG72TSfg6PEUpfNXI+zJmZkmSa0TIE3cuH5m/n1bGmVz9aVtJKMvK3VqSz+g7caalUxMaVj X-Received: by 2002:a05:6402:14c5:b0:51e:2e39:9003 with SMTP id f5-20020a05640214c500b0051e2e399003mr43376edx.40.1689887956512; Thu, 20 Jul 2023 14:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689887956; cv=none; d=google.com; s=arc-20160816; b=Q3ID/Epm1Oex0pKL7rqBaXM3N65rtCrOmzyiU/d/VYKWlCqM58ZbsGVlFpO04qXbbj 6D9xONQJltyMEO3Y1QFGVPjd5kAj5UTXCDWn6En36pXdjLuANlux7lIPieeOBi5q8kJ6 ihK7rC0tbIIIao8wlElUxcLCK0DRuLErvtA/OWJH+Efr8F/QSRpZbrlAZD7osQf8iFFo ZfpT/TETO2WmwS2RV2kSuUNxwpFTmh7he0jk/EaCBZ/TDOArJyVzmAupyR9pAodnzZTI 6O9iMxvlMOWju5LCIvEDqnvnux178WLV7uc/Ozz1QMsBuaeIv1v0HevJxu0FPytcJwl7 wmeA== 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=chUuj70DP6XgqQucGfa3UexrQOqmnYEonsbuI3rD2PI=; fh=UOk5tC92rpasvTHsS8FNeq1ESsZGN5rcMuNSzha6ebA=; b=0Fmji+d+yOZwAAvNFsqhiOopgr2OpmLOZT3gD9GlWjqq1L4FVhhYSJj3qTlXM1ObOi Bgj94F1KypL8g9H9u323/Y9ALANmqpgRLHIcxiZeUZc1MBowtMkgGW2g47UH5l6wJ19x jYCmg5Zda3GozBwS6nIPQC3Sb+CnTOn3A6y5g9aS+MSQ66LlfqlXDCEQ2KgW6bVt2gOK VvIf8klkqA7YXBjSpA0Qd7M/4lD9ztSQFcY9in62fywG1IcUMt0DAmA66YvS7chzIscE oPVY0lSdW2d4oXsIB78pz9DKOynZ8Fi4jH5KJvwWivopo9Ennm2tv8uk8oWQI/1n1SYk Jkfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=k8rvR7kw; 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 e14-20020a50ec8e000000b0051e3c92a20bsi1514613edr.318.2023.07.20.14.18.52; Thu, 20 Jul 2023 14:19:16 -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=@intel.com header.s=Intel header.b=k8rvR7kw; 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 S230077AbjGTUx3 (ORCPT + 99 others); Thu, 20 Jul 2023 16:53:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbjGTUxY (ORCPT ); Thu, 20 Jul 2023 16:53:24 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A67271D; Thu, 20 Jul 2023 13:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689886403; x=1721422403; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BwPuQNOSSS/oJufuw512vFJpXnRWfEZI58gglhVJE2c=; b=k8rvR7kwi5R/dty4bsqdfe163hv8KK7HvRoWZIu1TKEPBTfQgZ4PmEYI AgUPC+Ba8XkPa5q9Ls8kX1gfZwp9zrN7uKxer16f80g41rVCXKyXH5j7N PR5MA4Hz5tvztUxkGWMbEPLcjbhzkgb+iEHV/hCZhPVaguiQsqPOre6v1 SjXoSwa0r+9FuepY/nRP7Dv7wjz4kgL82+ptDT6jgd9ftaym1MwS0jZb6 mm61pdUDSDC3WQf1AXQifyjkIG3jhEP2eC6xYE1R28ZG5e+zfp4ZEXHVZ P1hX3QBDL9YQBIxF6JbFtY6KSBBia4L67o1UkO0twxKmr04wNjGIyq5+w w==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="370459741" X-IronPort-AV: E=Sophos;i="6.01,219,1684825200"; d="scan'208";a="370459741" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 13:53:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="971169131" X-IronPort-AV: E=Sophos;i="6.01,219,1684825200"; d="scan'208";a="971169131" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 20 Jul 2023 13:53:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 37C5693; Thu, 20 Jul 2023 23:53:28 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen Subject: [PATCH v1 2/8] iio: core: Use sysfs_match_string() helper Date: Thu, 20 Jul 2023 23:53:18 +0300 Message-Id: <20230720205324.58702-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230720205324.58702-1-andriy.shevchenko@linux.intel.com> References: <20230720205324.58702-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,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: INBOX X-GMAIL-THRID: 1771975954199583032 X-GMAIL-MSGID: 1771975954199583032 Use sysfs_match_string() helper instead of open coded variant. Signed-off-by: Andy Shevchenko --- drivers/iio/industrialio-core.c | 81 +++++++++++++-------------------- 1 file changed, 31 insertions(+), 50 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 6cca86fd0ef9..90e59223b178 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1400,50 +1400,32 @@ static ssize_t label_show(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(label); +static const char * const clock_names[] = { + [CLOCK_REALTIME] = "realtime", + [CLOCK_MONOTONIC] = "monotonic", + [CLOCK_PROCESS_CPUTIME_ID] = "process_cputime_id", + [CLOCK_THREAD_CPUTIME_ID] = "thread_cputime_id", + [CLOCK_MONOTONIC_RAW] = "monotonic_raw", + [CLOCK_REALTIME_COARSE] = "realtime_coarse", + [CLOCK_MONOTONIC_COARSE] = "monotonic_coarse", + [CLOCK_BOOTTIME] = "boottime", + [CLOCK_REALTIME_ALARM] = "realtime_alarm", + [CLOCK_BOOTTIME_ALARM] = "boottime_alarm", + [CLOCK_SGI_CYCLE] = "sgi_cycle", + [CLOCK_TAI] = "tai", +}; + static ssize_t current_timestamp_clock_show(struct device *dev, struct device_attribute *attr, char *buf) { const struct iio_dev *indio_dev = dev_to_iio_dev(dev); const clockid_t clk = iio_device_get_clock(indio_dev); - const char *name; - ssize_t sz; - switch (clk) { - case CLOCK_REALTIME: - name = "realtime\n"; - sz = sizeof("realtime\n"); - break; - case CLOCK_MONOTONIC: - name = "monotonic\n"; - sz = sizeof("monotonic\n"); - break; - case CLOCK_MONOTONIC_RAW: - name = "monotonic_raw\n"; - sz = sizeof("monotonic_raw\n"); - break; - case CLOCK_REALTIME_COARSE: - name = "realtime_coarse\n"; - sz = sizeof("realtime_coarse\n"); - break; - case CLOCK_MONOTONIC_COARSE: - name = "monotonic_coarse\n"; - sz = sizeof("monotonic_coarse\n"); - break; - case CLOCK_BOOTTIME: - name = "boottime\n"; - sz = sizeof("boottime\n"); - break; - case CLOCK_TAI: - name = "tai\n"; - sz = sizeof("tai\n"); - break; - default: + if (clk < 0 && clk >= ARRAY_SIZE(clock_names)) BUG(); - } - memcpy(buf, name, sz); - return sz; + return sprintf(buf, "%s\n", clock_names[clk]); } static ssize_t current_timestamp_clock_store(struct device *dev, @@ -1453,22 +1435,21 @@ static ssize_t current_timestamp_clock_store(struct device *dev, clockid_t clk; int ret; - if (sysfs_streq(buf, "realtime")) - clk = CLOCK_REALTIME; - else if (sysfs_streq(buf, "monotonic")) - clk = CLOCK_MONOTONIC; - else if (sysfs_streq(buf, "monotonic_raw")) - clk = CLOCK_MONOTONIC_RAW; - else if (sysfs_streq(buf, "realtime_coarse")) - clk = CLOCK_REALTIME_COARSE; - else if (sysfs_streq(buf, "monotonic_coarse")) - clk = CLOCK_MONOTONIC_COARSE; - else if (sysfs_streq(buf, "boottime")) - clk = CLOCK_BOOTTIME; - else if (sysfs_streq(buf, "tai")) - clk = CLOCK_TAI; - else + ret = sysfs_match_string(clock_names, buf); + if (ret < 0) + return ret; + + switch (ret) { + case CLOCK_PROCESS_CPUTIME_ID: + case CLOCK_THREAD_CPUTIME_ID: + case CLOCK_REALTIME_ALARM: + case CLOCK_BOOTTIME_ALARM: + case CLOCK_SGI_CYCLE: return -EINVAL; + default: + clk = ret; + break; + } ret = iio_device_set_clock(dev_to_iio_dev(dev), clk); if (ret)