From patchwork Fri Jul 21 17:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp351834vqg; Fri, 21 Jul 2023 10:16:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3DElgyxuFKUXg4aBKVICRWfrgM7V+MdEV/In+b8l8JvPOXLhkIDYM03bCY0FaNwEt8zSA X-Received: by 2002:a05:6a20:12cc:b0:134:9f4e:623f with SMTP id v12-20020a056a2012cc00b001349f4e623fmr2597598pzg.14.1689959763395; Fri, 21 Jul 2023 10:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959763; cv=none; d=google.com; s=arc-20160816; b=e40WNKlfou5JGKP9KFzSEqyBENkeIE62gl09sY/AseDJLQKeGKGDGEe3l28Xhc27Hd v5WcWSEj8h1wv6FoCvQyI5uYxel9kKI/NEoQaPpAt3G8e1jWU82rPBrnq/7EtzuSITv3 igTNTa/ZN5UytxE+rNZdZmIwxJybceCwycfFxQ5dw4CrGGcBJ8JHpGlJ/uHGBR6Plok6 plC3M2guLn8XfgTQEJQeHjae5+G+IvuPu+qQJvGv2N9zjzZzxkEv4XWBd0SBH3t+gcoj CUxYe5dmD+hE6SKnTIUGP8NuDnUqTDspCU6qLbc/5rV8kwDDj0UauONdPmzn0Kf5M+S4 QOYw== 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=NcX1azEZt6Ej43CM7san/gUib1PEOxT3D2PFEAzO2Qw=; fh=DccVgf296lzstxLxowd941ox6+yUkYgNGlfnJRKPjjQ=; b=apiTJLN9dhFwW4RAwS8bwFBU98KB02m0by84yO0XDZQCM6fXwUlKxq2EOZG855TmM6 RgvujdDwoQUQs6pTGVptmSRBYS0dY7q2ybm1Guh7HElekRQG/tXo5hFP61M/owKOB4iv 8NU7sUxqecIUCb7w97sKaNfX1A8DhVZT/aNLJl8XDXDmMlk1YBHWZ7ZYkQ1y6jXjoM3R wk4PZmtb2BL8Hvgmp07osgZar1+lUQCNZWGUkZ0yqcY7Z65HiUmh9/8zRVmyMGTvQvvF lxDoFrPMKEMNTkbZTn3UzYAxgmavkBtabPF4Yhabey/pqWQiPC5hcgoD0M92s+8+lhQw HjDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VRB7gyB3; 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 z10-20020a056a001d8a00b006866669fff8si1371499pfw.57.2023.07.21.10.15.50; Fri, 21 Jul 2023 10:16:03 -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=VRB7gyB3; 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 S230147AbjGURAh (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbjGURAW (ORCPT ); Fri, 21 Jul 2023 13:00:22 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC29230D4; Fri, 21 Jul 2023 10:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958821; x=1721494821; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RBL/WYJF2pgAGN2U87+I/5wNQ/TVlUj5uO/xGqVLkms=; b=VRB7gyB3WP63ltdkJPNxq6+iB0JxF+Egl+YWy/BCtKcDqmezHtU5B9yb 87gFMkbH39a7BUAn+SE37O8TyyS39ETbWOSwcSGgoJGO7S+9nQLQWlvHg s5k4w2EmZd/WLjy5umayzOFMmceeRRBZKpxJ+jcZXMc/UpCmCOLCV4uSr z9xln9UMrohsmmvR5JYouvQEUkvh8F59yH5sMYoWYanrL7LGSBTRkbXdI GVPj3HIsNXKGdKa6RCi9Vu4OLJKL8a7DN75vg822kO+E4MqcI1N39SPgu gG2KsNeaP4a8AxVKFYSDHQodsmNVDkg6klsyfw04LRCNv+0340LQPJeto Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739459" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739459" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540195" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540195" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2ED1117D; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Nuno Sa Subject: [PATCH v2 1/8] iio: core: Add opaque_struct_size() helper and use it Date: Fri, 21 Jul 2023 20:00:15 +0300 Message-Id: <20230721170022.3461-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772051248900872922 X-GMAIL-MSGID: 1772051248900872922 Introduce opaque_struct_size() helper, which may be moved to overflow.h in the future, and use it in the IIO core. Cc: Uwe Kleine-König Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index c117f50d0cf3..6cca86fd0ef9 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1617,6 +1617,28 @@ const struct device_type iio_device_type = { .release = iio_dev_release, }; +/** + * opaque_struct_size() - Calculate size of opaque structure with trailing aligned data. + * @p: Pointer to the opaque structure. + * @a: Alignment in bytes before trailing data. + * @s: Data size in bytes (can be 0). + * + * Calculates size of memory needed for structure of @p followed by the aligned data + * of size @s. When @s is 0, the alignment @a is not taken into account and the result + * is an equivalent to sizeof(*(@p)). + * + * Returns: Number of bytes needed or SIZE_MAX on overflow. + */ +#define opaque_struct_size(p, a, s) ({ \ + size_t _psize = sizeof(*(p)); \ + size_t _asize = ALIGN(_psize, (a)); \ + size_t _ssize = s; \ + _ssize ? size_add(_asize, _ssize) : _psize; \ +}) + +#define opaque_struct_data(p, a) \ + ((void *)(p) + ALIGN(sizeof(*(p)), (a))) + /** * iio_device_alloc() - allocate an iio_dev from a driver * @parent: Parent device. @@ -1628,19 +1650,13 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) struct iio_dev *indio_dev; size_t alloc_size; - alloc_size = sizeof(struct iio_dev_opaque); - if (sizeof_priv) { - alloc_size = ALIGN(alloc_size, IIO_DMA_MINALIGN); - alloc_size += sizeof_priv; - } - + alloc_size = opaque_struct_size(iio_dev_opaque, IIO_DMA_MINALIGN, sizeof_priv); iio_dev_opaque = kzalloc(alloc_size, GFP_KERNEL); if (!iio_dev_opaque) return NULL; indio_dev = &iio_dev_opaque->indio_dev; - indio_dev->priv = (char *)iio_dev_opaque + - ALIGN(sizeof(struct iio_dev_opaque), IIO_DMA_MINALIGN); + indio_dev->priv = opaque_struct_data(iio_dev_opaque, IIO_DMA_MINALIGN); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type; From patchwork Fri Jul 21 17:00:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp359463vqg; Fri, 21 Jul 2023 10:29:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlG5d7lGsdK54eRCQSYgFiaGYzRWw1C6ZCBtykW355UWYwsyAipfxkI1hfZvxGvOHXwZROKJ X-Received: by 2002:aa7:c857:0:b0:51e:65d:1f6c with SMTP id g23-20020aa7c857000000b0051e065d1f6cmr1801032edt.9.1689960597139; Fri, 21 Jul 2023 10:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689960597; cv=none; d=google.com; s=arc-20160816; b=dFi8o819bwBDqcpXtKw6mIhNTnKYgyJBMXoZBdJ6oDR8Uy9ZTuBNxRB1UbbIYlpHIG fkjJH0JM0PSzHQHCFBk/0LqG/67P9DU56S2jSOaZboFKuLqnsX9yCOcYn5OCrfESwH3W is3DZ/pN+KTR5Ycg78PDlO/dG5gDKgNBzjtFC9zNGruFOM+OEiEEGEuLSlCPubsHvFDg VU7nBWh6FDyM0GJOxkaClSvHGwtNq/MdQLhSX7Fk9ZdkdQXv4oZjB6uCQGo8KCpyqSaG Rnv8H2NqNDBuS4cWZeLIhLQjrFjo7h0jVXOgWFXodr/7sRob3n/7BijS5c4L15tCLgeK oKVA== 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=RXijnXiMqb7hna35yi+74M7t+1soxmx9TXSK5FYKJ7I=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=NF2FwU3N/vVs5o7tkHgRegh6/Jcg38pJH0r4P0HDaTyccGPKb7oCLwAgBFHDYxKhD4 p935PSFbyO77hQK2bPRvc8Ywn00XiEm9QOYasyk+xp7GO5HhCt+Qe3I0YlZzXGnd8gwl DoesTSE7dQTRXlAMvmOz1/zT/kquWtKN9VDutdqPaz/d6+hxRskNit9/aaYPdY1dOXwx zrg1KUlMqM3hyPBc9lC+NeIQCaxbkK1T2BM99WPRC8kxmkW9vm+MaWTMPKTgDuhPdlbP HuIbjyTogrA+E055PRCBczfpXbn4uziEUIhgeVmD9JOoVq3ubvJg11FOIYrEdAEpIljX 5rEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dG7VBNAY; 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 k4-20020aa7c384000000b005164ef74becsi2473541edq.106.2023.07.21.10.29.33; Fri, 21 Jul 2023 10:29:57 -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=dG7VBNAY; 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 S231292AbjGURAa (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230268AbjGURAV (ORCPT ); Fri, 21 Jul 2023 13:00:21 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 483802D77; Fri, 21 Jul 2023 10:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958820; x=1721494820; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5nJHjGERAW3jaXOKzutpblot6hKhdh8NmrgkghAWl1s=; b=dG7VBNAYX/Ldi1EXZKu3gKexBGtTDt3rUvfKueJL3HAw+4+lpUffy7g+ OBB2sKvKChX4+MjdRCi9zWL/sePKYmDMrltaKtpuO0ZwdPgoRF+Wu68kB +MTlDoElTwTwFygKDxIJB4yWEsF6lmXJlVSsj4gCJFvfLlqMpuPsyCbMi k8gEra+rbPOb2oCaE/cCgYStrJQBzOAw7M/cdbx7buzyQdFKbVWBwNg1x Xy8/7OsHWaujERvGBa20JrXm35Ipd0AEsCfkLBPwAQENH28Z+WwvLJOcj QudIKMSgWkEyOHM88c2oTq1C5d052U50NacG9sUVV7fAcvtE2gUK64/lU g==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="453443908" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="453443908" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675106518" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="675106518" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 21 Jul 2023 10:00:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 426A542D; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 2/8] iio: core: Use sysfs_match_string() helper Date: Fri, 21 Jul 2023 20:00:16 +0300 Message-Id: <20230721170022.3461-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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,URIBL_BLOCKED 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: 1772052123051177527 X-GMAIL-MSGID: 1772052123051177527 Use sysfs_match_string() helper instead of open coded variant. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- 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..4e45740331ee 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 sysfs_emit(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) From patchwork Fri Jul 21 17:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp358094vqg; Fri, 21 Jul 2023 10:27:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlGjLZ4iwKKYvljCa6Vl3PTfzz+x+eYU7rJ5FY4/Sgitu/wD6/dOhDTpfnZDX/tRelIGYzA/ X-Received: by 2002:a05:6808:99:b0:39e:c615:949f with SMTP id s25-20020a056808009900b0039ec615949fmr2767025oic.24.1689960427564; Fri, 21 Jul 2023 10:27:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689960427; cv=none; d=google.com; s=arc-20160816; b=sZD/0TKDmUu+nM3M7GBh9RvwINUS7dg4GakIAr31yneZFyK9nEzh/3nd7yd617Iuxf 90oHh6h6PfTwmxPPxJ+OUHzx/7oFDgFGrfpzTMoYZkoOZ6eNA6YVklETlCfjyJ6sUeB7 mKRens3BTVbqaNxIqu6opX2Lqqz657WDv2i5eahTjHi78aTaWeZQ5NaNRIFXP7xnL1CW 8jPHROA6F6+tKkxxUv5gb4yUAPC8+wsQIdJUDgriQ8bKGy6+cRRFiJ0Gsz9R17gZpvdm Da8OP5SY9uSo0oHkXyvbaFeimV1Q/4TBiUXui2gXV1LUFweb5D2zEXj8Ytfaph5rp2Tc 6QRw== 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=FeMxuZeJLN3/Zv+YIA1CBbRwl1B0a5SYPVc/5LfHths=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=ODQKCF2sF4bi5CStM3EcYGiqjDl+hIZ/fpQOmgbJyUOUUfoXDfHMrDvrucKggBqd6u 1xrQsR1qIAqkQt7+PZyN0aep/nn4pvxoWV3bYtgULSQ+5TU5S5QzII8kuEDFku2GGhzq p2xbOcyLsBU676cHTSd3qgFuDrlBrsS4RCZ1m2u0H8arghNpWUNqWld4VaNU3P50mSNe yyJVLzavIjCzSmeYsA2IWebMDX+ZUXePEZGCFhDp4k13b6fk2z73Mlu0aSTe1MQw+Fw8 tm92CHGNpE9BU7SBNwUibJTS2pfi2xAaDGLbTJWN4PzMtYNTUN5lDWmKfY35mRQT6h5o vHQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OlfaOZQq; 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 e1-20020a17090ada0100b00267b910cb37si3607696pjv.52.2023.07.21.10.26.54; Fri, 21 Jul 2023 10:27: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; dkim=pass header.i=@intel.com header.s=Intel header.b=OlfaOZQq; 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 S231311AbjGURAe (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbjGURAW (ORCPT ); Fri, 21 Jul 2023 13:00:22 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E7AC2D53; Fri, 21 Jul 2023 10:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958820; x=1721494820; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FZ6LKlQ1eKLJzZ117OvZPucOMpZOmzPiCLf/Siw2rWo=; b=OlfaOZQqD7SWfDs2krTBGODU2UjugIcq7tBkmsIQTPkSeb4+Urfg7U1a Gu9aQWakytlcSaQacR5cFqEJ/gBjHuHBp82lI9UNdXBgshKhNufyBQukq gEZXAYDJBuPK8rsHStQmakgW+B1hkNSdQTaQxR4e55TL14AhIsko+KcGI wlz6j6iZgzYEEPZbZo7EoZvhCUbe6zfscA0tj89QUa8iwHifpSkT6hipF 21Mwx3rH9QEvHU9vElG1YSoI1i0o05Qm5s0/n/GAPCYsmBzqV1ykexyIE C+khHwaJnbzbYBCEHonvOXpW73n+zU4PGBZ3uwjm8v26xllpFIIcWDTB+ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739454" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739454" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540194" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540194" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4CD74370; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 3/8] iio: core: Switch to krealloc_array() Date: Fri, 21 Jul 2023 20:00:17 +0300 Message-Id: <20230721170022.3461-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772051945399606830 X-GMAIL-MSGID: 1772051945399606830 Let the krealloc_array() copy the original data and check for a multiplication overflow. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 4e45740331ee..6e28c2a3d223 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1465,7 +1465,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, const struct attribute_group **new, **old = iio_dev_opaque->groups; unsigned int cnt = iio_dev_opaque->groupcounter; - new = krealloc(old, sizeof(*new) * (cnt + 2), GFP_KERNEL); + new = krealloc_array(old, cnt + 2, sizeof(*new), GFP_KERNEL); if (!new) return -ENOMEM; @@ -1483,13 +1483,13 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev) { struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev); int i, ret = 0, attrcount, attrn, attrcount_orig = 0; + struct attribute **attrs, **attr, *clk = NULL; struct iio_dev_attr *p; - struct attribute **attr, *clk = NULL; /* First count elements in any existing group */ - if (indio_dev->info->attrs) { - attr = indio_dev->info->attrs->attrs; - while (*attr++ != NULL) + attrs = indio_dev->info->attrs ? indio_dev->info->attrs->attrs : NULL; + if (attrs) { + for (attr = attrs; *attr; attr++) attrcount_orig++; } attrcount = attrcount_orig; @@ -1521,20 +1521,14 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev) if (clk) attrcount++; + /* Copy across original attributes, and point to original binary attributes */ iio_dev_opaque->chan_attr_group.attrs = - kcalloc(attrcount + 1, - sizeof(iio_dev_opaque->chan_attr_group.attrs[0]), - GFP_KERNEL); + krealloc_array(attrs, attrcount + 1, sizeof(*attrs), GFP_KERNEL); if (iio_dev_opaque->chan_attr_group.attrs == NULL) { ret = -ENOMEM; goto error_clear_attrs; } - /* Copy across original attributes, and point to original binary attributes */ if (indio_dev->info->attrs) { - memcpy(iio_dev_opaque->chan_attr_group.attrs, - indio_dev->info->attrs->attrs, - sizeof(iio_dev_opaque->chan_attr_group.attrs[0]) - *attrcount_orig); iio_dev_opaque->chan_attr_group.is_visible = indio_dev->info->attrs->is_visible; iio_dev_opaque->chan_attr_group.bin_attrs = From patchwork Fri Jul 21 17:00: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: 124034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp359470vqg; Fri, 21 Jul 2023 10:29:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlH+dtOYE0saCRgi8BAnLAwnBSS0q3LeEmCOUxXv72UKyU6Dsk5hIElEsL9pORKCZ1vFN1jF X-Received: by 2002:a05:6402:1854:b0:51e:d4b:3c9d with SMTP id v20-20020a056402185400b0051e0d4b3c9dmr2019551edy.23.1689960597969; Fri, 21 Jul 2023 10:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689960597; cv=none; d=google.com; s=arc-20160816; b=ZA81DElsnhM1sYzH+brsmyVWxSghKyGSrxiJiIgS9d0ppN0ojQp29JPa/I3otJM4tB vd4ATH3zUrqmYBevNq75F31hxCDAZjTZUrkenCY/Krml5lO2xlddY898dFv+svJcsgnC CKwtpratEKaT8PvVnCfX5Y/Cbw1jgFMxtWqg96y3IjqnrFB4G0VFI8qA+taREFjFNGKZ kNjjBi2EhhNW9TX7wRtPJ4RUFTZSTOsqWXYCQuMHQ/g1oedmLYsgzK6pG+lHR2ZmMAc0 UlgaArBn0YiUode13l4GDsmenFOlXhdqtbwrnDLRQIJO9X6hV+8XAqkWAwIXqnAZH0Tw a02A== 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=Ns28UV9+6BxfPhEaJOZvh4/qN0snNowpbOsznuSEPgs=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=vVdrzzP9gdZoY0cWpvmJHG5TEWW4sSu6a292937KhGCpE+MVsIF85nZpNcEjMKHWPs uMn3IUhncIwevaLCYYTpyNciz7BzcMiU2S7GXw0C+1+I8UsQbVpDwW/quXQo2lpNW5U0 RTRxmRvq7fvvCnxBCckr22dkcRmdXGsF33XA0tidmEnTSDBWidZRuBAAdDwCELyTZSsC 6pWwkoYoQ7WXQfJYQECVqLkyp62q8+qfuVvQ5dAHAwi4o+H0ofJxXlK5E076OevNSYeR gTBYO6kg9aR4lY+/mwp/vOqM8egXsov0q9sz9wpCPb9Pb7LaJwe15bDDac+ub4vTMIRs fSYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R3GGX5vn; 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 r16-20020a056402035000b0052160968facsi2597369edw.414.2023.07.21.10.29.34; Fri, 21 Jul 2023 10:29:57 -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=R3GGX5vn; 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 S231190AbjGURA0 (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230327AbjGURAU (ORCPT ); Fri, 21 Jul 2023 13:00:20 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2CBE26A0; Fri, 21 Jul 2023 10:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958818; x=1721494818; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UZLQH0kViux9VJJxBn8faoSNy7gR7pEqp4KmqCGfoYU=; b=R3GGX5vnHWgT7f+TO9myhR7lxYMIEzh33BtzFngVA9TMR/wB9Wud2Aka XixqJ6qfkfWUxsk46BSau0sNO+uvwnqrHkJ92g9PAJmXQX9F+3a6pIFgc oDc/QOiW+XZIN1lR5tviy+VJwabvwsvDFyzxqMrPJUnJi9uMg8UE/k2fd W0tagzMUzIE9zZrAohKsDlyUQPE5sEcm39cCGK/u+1P7vDnQIML1yvoU6 HreOArqOUCV6CfalsLbIOUvd5n+rXAFLgJkrpNt1PpZ89toKi+mL61bAt 35k/ybFoX8b64EDv7kYcsBXp/SjawXVlucacDRHWbWHhEuD06VH+qPC3b w==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739466" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739466" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540196" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540196" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 609895FC; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 4/8] iio: core: Use min() instead of min_t() to make code more robust Date: Fri, 21 Jul 2023 20:00:18 +0300 Message-Id: <20230721170022.3461-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772052123968450147 X-GMAIL-MSGID: 1772052123968450147 min() has strict type checking and preferred over min_t() for unsigned types to avoid overflow. Here it's unclear why min_t() was chosen since both variables are of the same type. In any case update to use min(). Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 6e28c2a3d223..78cc67efa490 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -389,7 +389,7 @@ static ssize_t iio_debugfs_write_reg(struct file *file, char buf[80]; int ret; - count = min_t(size_t, count, (sizeof(buf)-1)); + count = min(count, sizeof(buf) - 1); if (copy_from_user(buf, userbuf, count)) return -EFAULT; From patchwork Fri Jul 21 17:00:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp351695vqg; Fri, 21 Jul 2023 10:15:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlHbIi7JdoggAoI6OvCrIwg1J8uIgq6iuLBWIx2cTX081QAFZB6RR6Gki0VfB8FKVS50FpIE X-Received: by 2002:a05:6a20:26a5:b0:137:6958:d517 with SMTP id h37-20020a056a2026a500b001376958d517mr1827815pze.24.1689959749891; Fri, 21 Jul 2023 10:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959749; cv=none; d=google.com; s=arc-20160816; b=osr53wKUkB996q63bctP+mxKzkbnVBTNwu74q0SOQ52Fz/rmX542WwLxtm4UyuDl3J TGS8ztMiwEnEP5JmDr/PKKbcjd8T6OBsjmIHJe847hjkYKqmgLa7ZOzldrVTay++XPA0 qxxkjBc/T4ihSjVmug26BvCVlSXcxNLUIiFkiYt9naY5UdvxGZE4QsrGAH5etkJXZ4tM t6AT+8eQHWF8LeELa/KEmF+pSnG2y5JG+sOplk/fKmo40OJPFChW6ia0xZkWs5TD7EUa o3xV5tu5uB4GTCim2ZA1pL+x4syBzvrnLexitnnoBwYzD7+6nWV1yd+MU9wvPdEMmy0R 9wyg== 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=K7O9gvHZds+XaOmE/WTF4qRPR3eQxJF3QnW22OHgwgU=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=FS7/wbOn6CVnfAPmjrW/fNs88LHKlBniTx3AQPrqcBzy76frB3OSIVJ9gS5VVu0fzT FKzEPwM5j1AY/Y8BsIxLshdchxxOqNIlb/OnmMSGrcigiWS0f0QFcJf6dqcSPBo23OzK jkPT80y+WPxZQaJpVDFcGL1iOy4qR5DAPDZ/VG35nu0C7/fmXlx/XVW4/TsMo0YY1JgE CNII+Ca6P06BE54yzk+eYAciFLlA4f5JjOkkWuoaFKEUiKjaKuEgx8D4wvVnmU3X6KdE J+9HWc1NsLZu0LMEr5NeiYp98VGYLaFmk98dRv+sA1JE1qL26bsPmccqAFeYgXTZOzN9 Arhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gxxPMgVV; 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 bv188-20020a632ec5000000b00553ebb05d25si3356140pgb.80.2023.07.21.10.15.36; Fri, 21 Jul 2023 10:15:49 -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=gxxPMgVV; 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 S231411AbjGURAn (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbjGURAZ (ORCPT ); Fri, 21 Jul 2023 13:00:25 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4475D2D50; Fri, 21 Jul 2023 10:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958822; x=1721494822; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=325fM0IBOgfY/NJbM2dkuOlixnwd7vBQ+WpRaNaNsK8=; b=gxxPMgVVf1JbTpB/O0sLo1UMWeWa/WioPDv+UN2tKOBoHQ/tIM6yS4yB zdG6SvnynUs935J51NsCXczSQqheCWIkdzNruU1etRintTPYQB7RFjD2Q 9/VINPXhpFc3WluXAutFQXJmpKRwBm6S7SA61+9oFyyHhcI9CKWwkb++e wxdeWr17cvHLLt7FO5s7AELfe6d90WEaZMMJl3S2NxCkFywJkgUXhBuO8 IDOJb8uICqxOcHcNLbl27FAoarj71jaBMRKX5OkQ8GkLwKfS/IHWjvhHn atwRpvXk0itS1JCw8igUnWM8shNiVFBgzzEoHlyP/QRgpeXndZNWUsDZO w==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739478" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739478" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540212" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540212" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:18 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6E87E604; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 5/8] iio: core: Get rid of redundant 'else' Date: Fri, 21 Jul 2023 20:00:19 +0300 Message-Id: <20230721170022.3461-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772051234937291064 X-GMAIL-MSGID: 1772051234937291064 In the snippets like the following if (...) return / goto / break / continue ...; else ... the 'else' is redundant. Get rid of it. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 78cc67efa490..66cea23df7e0 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -524,7 +524,7 @@ ssize_t iio_enum_read(struct iio_dev *indio_dev, i = e->get(indio_dev, chan); if (i < 0) return i; - else if (i >= e->num_items || !e->items[i]) + if (i >= e->num_items || !e->items[i]) return -EINVAL; return sysfs_emit(buf, "%s\n", e->items[i]); @@ -1217,7 +1217,7 @@ static int iio_device_add_info_mask_type(struct iio_dev *indio_dev, &iio_dev_opaque->channel_attr_list); if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE)) continue; - else if (ret < 0) + if (ret < 0) return ret; attrcount++; } @@ -1255,7 +1255,7 @@ static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev, kfree(avail_postfix); if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE)) continue; - else if (ret < 0) + if (ret < 0) return ret; attrcount++; } From patchwork Fri Jul 21 17:00:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp352216vqg; Fri, 21 Jul 2023 10:16:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/jeFQf49wYYCDyGWn4R/rpHqQB4KGkJAo3PScUx8vryV8uaSK3S+JUzBKoTzzrKf2Jg+q X-Received: by 2002:a05:6a00:15c3:b0:676:eb8d:e3bc with SMTP id o3-20020a056a0015c300b00676eb8de3bcmr748743pfu.22.1689959794934; Fri, 21 Jul 2023 10:16:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959794; cv=none; d=google.com; s=arc-20160816; b=VCQGla+dctkwyy4QilyGfthhj4hjA4gFvUWbtPmCxVhCQwgLrg8uxHUxYWWoh89L5Y xxtrNaKPQ+PaP8kakmmcQBA8J4tpHvdYFXtSyjfwYf+rSksIAhxAWvfKyEbeDzQIioC2 efbySH+ajcww9aMBd08WLWPNXS6tM7RTr59Bx3+uQ2/8r49qtwy3VPqtpmwHQ1Kxi1e2 B+ciIzrYCQtABz8V7233TFDT8gMga8+JPyV+P1ggc5oOPCrLERcRVsVj9+xYfwudkLpR 5rCEnijMs2fCW+RaJie86rRFfIZBvyzWOtYuclbR2VgK5ZgxXZhZ1gBc8vl9FSJX4W7Z 93Mg== 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=a+2jzz7rpqwTLhlKSseAM8IjQAbHU0Ch0Kcm1SGyYYc=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=FxzXSJTjojueLqTgMUwSrPqVr594pgHd41Tmdafh1XqaYo+2Zko2uRMVTI8dN3dWmp yplL8ciHZRuZQupoha6XZiKF7HT6DtJ6h02IpPFgZC1aPLjCtuUPb1KMpoxOSjyUbPrJ SHfiELhBOorSktIEtBFFVVQcU5NZ/cfIcb72qJ+cqTZeF1urpiQolpd6OszDWBpVe4Yp B1Q4H75tN639FJ3eIrPrK9rOzEdLHHLnqmcKMReE3TTjVH2TVKTe9jtFTl9hUnf3a3ET UVkcvOZt+qOUhpHF0yF90R9m2kjfWHEHC474H+gknyAmAPKo9WUZ8C+4xaiYlJEh20M/ Uynw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lLMQjffv; 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 z10-20020a056a001d8a00b006866669fff8si1371499pfw.57.2023.07.21.10.16.22; Fri, 21 Jul 2023 10:16:34 -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=lLMQjffv; 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 S231396AbjGURAt (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231166AbjGURA0 (ORCPT ); Fri, 21 Jul 2023 13:00:26 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4D712D51; Fri, 21 Jul 2023 10:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958822; x=1721494822; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T3XCTeFPAAlE3o8HaU8QjcX7N6rcLUJEWl9U9IJiSCU=; b=lLMQjffvtZR+2dHaF/m8iHVcgSsDh9b0HglP2T0gz/4ZDRD/GTMYOF0p +VRdb347xUL5MCLwgz3pmJjmPMyu1K2m3rhw4kRrFALEEPxevEjiwm12x DsIW/nB+LhnrYocICim14FRp3ezsaYP24W/q3wpZgpx1BelEuc6COSZFH GEL/m8voLyIgWYm12iquthdAgwbobzwkP7PVHcNbcMRBaJG/cGIa0EA0y D4ipuvai7+vR/oNo3EWURal20IV3pWUiapeKgbtp1mdiMTpqrYqdJZ4Y5 KnH2H0kP+MTw0qRl/cZKTVf6JJSw/4ySDzc9e3uJJFv6eA2NlTQrjVmR1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739486" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739486" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540213" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540213" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:18 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 78376516; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 6/8] iio: core: Fix issues and style of the comments Date: Fri, 21 Jul 2023 20:00:20 +0300 Message-Id: <20230721170022.3461-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772051282026512587 X-GMAIL-MSGID: 1772051282026512587 The `scripts/kernel-doc -v -none -Wall` reports several issues with the kernel doc in IIO core C file. Update the comments accordingly. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa Reviewed-by: Randy Dunlap --- drivers/iio/industrialio-core.c | 57 +++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 66cea23df7e0..a9b9804097ab 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -/* The industrial I/O core +/* + * The industrial I/O core * * Copyright (c) 2008 Jonathan Cameron * @@ -183,7 +184,9 @@ static const char * const iio_chan_info_postfix[] = { * @indio_dev: Device structure whose ID is being queried * * The IIO device ID is a unique index used for example for the naming - * of the character device /dev/iio\:device[ID] + * of the character device /dev/iio\:device[ID]. + * + * Returns: Unique ID for the device. */ int iio_device_id(struct iio_dev *indio_dev) { @@ -196,6 +199,8 @@ EXPORT_SYMBOL_GPL(iio_device_id); /** * iio_buffer_enabled() - helper function to test if the buffer is enabled * @indio_dev: IIO device structure for device + * + * Returns: True, if the buffer is enabled. */ bool iio_buffer_enabled(struct iio_dev *indio_dev) { @@ -225,6 +230,9 @@ EXPORT_SYMBOL_GPL(iio_get_debugfs_dentry); * iio_find_channel_from_si() - get channel from its scan index * @indio_dev: device * @si: scan index to match + * + * Returns: + * Constant pointer to iio_chan_spec, if scan index matches, NULL on failure. */ const struct iio_chan_spec *iio_find_channel_from_si(struct iio_dev *indio_dev, int si) @@ -249,7 +257,9 @@ EXPORT_SYMBOL(iio_read_const_attr); /** * iio_device_set_clock() - Set current timestamping clock for the device * @indio_dev: IIO device structure containing the device - * @clock_id: timestamping clock posix identifier to set. + * @clock_id: timestamping clock POSIX identifier to set. + * + * Returns: 0 on success, or a negative error code. */ int iio_device_set_clock(struct iio_dev *indio_dev, clockid_t clock_id) { @@ -275,6 +285,8 @@ EXPORT_SYMBOL(iio_device_set_clock); /** * iio_device_get_clock() - Retrieve current timestamping clock for the device * @indio_dev: IIO device structure containing the device + * + * Returns: Clock ID of the current timestamping clock for the device. */ clockid_t iio_device_get_clock(const struct iio_dev *indio_dev) { @@ -287,6 +299,8 @@ EXPORT_SYMBOL(iio_device_get_clock); /** * iio_get_time_ns() - utility function to get a time stamp for events etc * @indio_dev: device + * + * Returns: Timestamp of the event in nanoseconds. */ s64 iio_get_time_ns(const struct iio_dev *indio_dev) { @@ -594,7 +608,7 @@ EXPORT_SYMBOL_GPL(iio_show_mount_matrix); * If device is assigned no mounting matrix property, a default 3x3 identity * matrix will be filled in. * - * Return: 0 if success, or a negative error code on failure. + * Returns: 0 if success, or a negative error code on failure. */ int iio_read_mount_matrix(struct device *dev, struct iio_mount_matrix *matrix) { @@ -692,9 +706,9 @@ static ssize_t __iio_format_value(char *buf, size_t offset, unsigned int type, * @vals: Pointer to the values, exact meaning depends on the * type parameter. * - * Return: 0 by default, a negative number on failure or the - * total number of characters written for a type that belongs - * to the IIO_VAL_* constant. + * Returns: + * 0 by default, a negative number on failure or the total number of characters + * written for a type that belongs to the IIO_VAL_* constant. */ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals) { @@ -847,8 +861,8 @@ static ssize_t iio_read_channel_info_avail(struct device *dev, * @fract: The fractional part of the number * @scale_db: True if this should parse as dB * - * Returns 0 on success, or a negative error code if the string could not be - * parsed. + * Returns: + * 0 on success, or a negative error code if the string could not be parsed. */ static int __iio_str_to_fixpoint(const char *str, int fract_mult, int *integer, int *fract, bool scale_db) @@ -917,8 +931,8 @@ static int __iio_str_to_fixpoint(const char *str, int fract_mult, * @integer: The integer part of the number * @fract: The fractional part of the number * - * Returns 0 on success, or a negative error code if the string could not be - * parsed. + * Returns: + * 0 on success, or a negative error code if the string could not be parsed. */ int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer, int *fract) @@ -1618,7 +1632,10 @@ const struct device_type iio_device_type = { * iio_device_alloc() - allocate an iio_dev from a driver * @parent: Parent device. * @sizeof_priv: Space to allocate for private structure. - **/ + * + * Returns: + * Pointer to allocated iio_dev on success, NULL on failure. + */ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) { struct iio_dev_opaque *iio_dev_opaque; @@ -1668,7 +1685,7 @@ EXPORT_SYMBOL(iio_device_alloc); /** * iio_device_free() - free an iio_dev from a driver * @dev: the iio_dev associated with the device - **/ + */ void iio_device_free(struct iio_dev *dev) { if (dev) @@ -1689,7 +1706,7 @@ static void devm_iio_device_release(void *iio_dev) * Managed iio_device_alloc. iio_dev allocated with this function is * automatically freed on driver detach. * - * RETURNS: + * Returns: * Pointer to allocated iio_dev on success, NULL on failure. */ struct iio_dev *devm_iio_device_alloc(struct device *parent, int sizeof_priv) @@ -1716,8 +1733,8 @@ EXPORT_SYMBOL_GPL(devm_iio_device_alloc); * @filp: File structure for iio device used to keep and later access * private data * - * Return: 0 on success or -EBUSY if the device is already opened - **/ + * Returns: 0 on success or -EBUSY if the device is already opened + */ static int iio_chrdev_open(struct inode *inode, struct file *filp) { struct iio_dev_opaque *iio_dev_opaque = @@ -1750,7 +1767,7 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp) * @inode: Inode structure pointer for the char device * @filp: File structure pointer for the char device * - * Return: 0 for successful release + * Returns: 0 for successful release. */ static int iio_chrdev_release(struct inode *inode, struct file *filp) { @@ -1789,7 +1806,7 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) mutex_lock(&iio_dev_opaque->info_exist_lock); - /** + /* * The NULL check here is required to prevent crashing when a device * is being removed while userspace would still have open file handles * to try to access this device. @@ -1966,7 +1983,7 @@ EXPORT_SYMBOL(__iio_device_register); /** * iio_device_unregister() - unregister a device from the IIO subsystem * @indio_dev: Device structure representing the device. - **/ + */ void iio_device_unregister(struct iio_dev *indio_dev) { struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev); @@ -2017,7 +2034,7 @@ EXPORT_SYMBOL_GPL(__devm_iio_device_register); * * Use with iio_device_release_direct_mode() * - * Returns: 0 on success, -EBUSY on failure + * Returns: 0 on success, -EBUSY on failure. */ int iio_device_claim_direct_mode(struct iio_dev *indio_dev) { From patchwork Fri Jul 21 17:00:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp350967vqg; Fri, 21 Jul 2023 10:14:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRbl9zGLSWVvC2XVYn2O2TWDKXD/egc5RrWbvdgyPGDTEu9nSjSfpjVKQs8L8SXwwaIh2W X-Received: by 2002:a17:902:cec5:b0:1b8:a6be:ea82 with SMTP id d5-20020a170902cec500b001b8a6beea82mr5171366plg.26.1689959686351; Fri, 21 Jul 2023 10:14:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959686; cv=none; d=google.com; s=arc-20160816; b=xhvh9238Pm1wKtCShZfdfdid8c1usnRPX1zkT6aXwy9rZ0PF444gRAXQy664JsfqEs da+uuoxLbD6Q4llQEeeVfhtgk3GfCBIAvCnH9I8L97wtgZtPte48m8NPCmBJDyNUhPhJ rXVLdTZwTatWv3ywpkg1JR4C6Ib4g0t8MxuHuseMaH9QvbDP+Fc0LtOvccSTmSM2wk5A udao4iMCTqxl56j2Z9/hRDxj8LC5nnSLKY17Qa2tJp1uvGvB/GEunZJB52YsDHzOXgPD 7gh/6bt+4xl8nph7jZ/mbQcnj8OwzAOLquvpLepiL82koZBcU26mUHJ3ggKCGet0AHS3 4Rfw== 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=UqmqLE5R5gh2U5SvUYTjagSvWUQXQRw3rK/aZLRXnh4=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=oP4HEC5fea/CgG/9IWDNSstaaTclFEMr623OsjAvIc6ykGRXFE8Yy3q5n8u/w9flEt YpiL3HVzaWDln77FXl/9TJh/Mb0zQ8GaYfSWPIaIxSEifC2t/dMG382ycnabWw6lUMAG rJDPspVFgcbzMUjJY+I3/UiWAolO/sYvSafFwkFgA4c38ePXIhOylE2P+5WaHLOWcUrq y57Y8QzpD67xGUK9lBmYIH6MMKUFmKfOzSjQGAxXj8SDlp3qxG8DouRwwiJRsqAr6NXA sPTurt3JtINlZ38sgXRQTlhNcKuCTJ6EYXr4BBiuc0hvIbNoDlOeaRfDGdI8SviE1bwV POoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mujet7A7; 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 l8-20020a170902f68800b001b53c722c3fsi3666017plg.597.2023.07.21.10.14.31; Fri, 21 Jul 2023 10:14:46 -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=mujet7A7; 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 S231345AbjGURAk (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230502AbjGURAY (ORCPT ); Fri, 21 Jul 2023 13:00:24 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73F7426A0; Fri, 21 Jul 2023 10:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958821; x=1721494821; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KFTy3k5fjmzvEVapIibfwY9OKXik6UjBLw7ZmKrmWGc=; b=mujet7A7G3cW9RxjpJlxrLBXPxjpvfvbbNyXEUS9B7UDoMPOlJIpwUW3 PcLMSKN73OoIPB1yv2tNMiv4ohaH4J9wbufRWLtqyZedbcAm0fkumTmiZ KWICt0RDZFOSx/mVlxFKuFVDhmdQl4NfbZxQH4BqENv2he2Y5pil368K5 KeD1yFT1w/7CjthkQh1AOSi51025Ke/nNBy9cdVmhGmTQjYv15xBOPI39 eYf2Rp/ToISCDt5xiQdzPbVxtGumbFJevh1phIKmT+nk7MYTcd7Bs7OhE YiNWQgmlckpcCFQFDBgz5QJBBwutxA6c3oeHqXnujyF79eZR8zpavQivx Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="453443965" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="453443965" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675106536" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="675106536" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 21 Jul 2023 10:00:18 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7D2F866C; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 7/8] iio: core: Move initcalls closer to the respective calls Date: Fri, 21 Jul 2023 20:00:21 +0300 Message-Id: <20230721170022.3461-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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,URIBL_BLOCKED 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: 1772051168244834037 X-GMAIL-MSGID: 1772051168244834037 Move subsys_initcall() and module_exit() closer to the respective calls. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index a9b9804097ab..5c9c68d69fc6 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -354,6 +354,7 @@ static int __init iio_init(void) error_nothing: return ret; } +subsys_initcall(iio_init); static void __exit iio_exit(void) { @@ -362,6 +363,7 @@ static void __exit iio_exit(void) bus_unregister(&iio_bus_type); debugfs_remove(iio_debugfs_dentry); } +module_exit(iio_exit); #if defined(CONFIG_DEBUG_FS) static ssize_t iio_debugfs_read_reg(struct file *file, char __user *userbuf, @@ -2118,9 +2120,6 @@ int iio_device_get_current_mode(struct iio_dev *indio_dev) } EXPORT_SYMBOL_GPL(iio_device_get_current_mode); -subsys_initcall(iio_init); -module_exit(iio_exit); - MODULE_AUTHOR("Jonathan Cameron "); MODULE_DESCRIPTION("Industrial I/O core"); MODULE_LICENSE("GPL"); From patchwork Fri Jul 21 17:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp357357vqg; Fri, 21 Jul 2023 10:25:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlHGsCbGVfyUBITKqnpvH7kpsY3cN+rvglzzS6ViP7Q79ApYwxR+QAB8JFe2t5TFeLlqYDya X-Received: by 2002:a17:902:e54d:b0:1b7:f64b:379b with SMTP id n13-20020a170902e54d00b001b7f64b379bmr4479945plf.17.1689960344276; Fri, 21 Jul 2023 10:25:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689960344; cv=none; d=google.com; s=arc-20160816; b=1DYlwPWcKo192VIbiVsqHREPDwJYyzYoxt9uvJBGPdqKCcjHybZLczxSpkYJ46UvUx AAl20vkVnOHq0QzuIJfv6Jf7ST93HAFdZ3ygXsmzcspLTG3jBYNhps3e0N/919cNtiV2 sbMX2AXchq8qyXVfX02z4vxQP1WK56kcgDkproPaPlMW7NGlwnSE4Xwi1/IwgduLc2md RvWn8bPNMdpjNVT1cuJfH+D2RnYasYDuL/SBKO3DgEFkNOvj/rxOJDqq8Ji0maz5M2Wl uoa5Rmact9ZZgpr+MwUVH2RhwkKowAPO1ghA+2TwVfNHQjzilkzK3sjwLYPR/mU52/xI bLWQ== 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=5GMu31Y9ZAwnWpbHoEZtSARYW5cj1NCEtVZpjooJirA=; fh=zI/sCjjpFZFpRWFbJrpu9GJ6xSZKd2JacIs4UkYeF5Q=; b=raZpJuj12q8KPi+LAcYqhpJ5w6qfWjT+T6gToIs3dPRBBbnodJoS8UPTc9L7UazFwk uGwCJOggMSSsf2QCmbLXqMn/mZ+hEwpmnuEBK0iO/ZtiK2Gp8XtZFIVtgbI4Q0ZRZM0p FAIoP9wuvtEotCgbmuIgI8xX0L5sIU27bI8Yzqc8/4uhq/i3GQlyTuQI5ACF87zsuZf+ k8DZLoLzV3+/NN2N8XiKiviXpe5FbZndq6HqcZq4ikITOhVQ602r78TTq1mGMQYYymK+ Mu7wzGxFzWO/QAGYV5Pxeu1uXn1GWd0iQ02XBF4AblZzmSuNTmW9UA98TvGelldIEkHB /EIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dcdysi9U; 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 d11-20020a170903230b00b001b89b77ce99si3830106plh.458.2023.07.21.10.25.30; Fri, 21 Jul 2023 10:25:44 -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=dcdysi9U; 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 S231573AbjGURAq (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231197AbjGURA0 (ORCPT ); Fri, 21 Jul 2023 13:00:26 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C53962D53; Fri, 21 Jul 2023 10:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958822; x=1721494822; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/foF2WXy3sLwO5FNP6HwLNSDaxhXkIAkyYPFiKkl/9I=; b=dcdysi9UIF59ioef9yEo0G/TLTe/+CJDffBPPt4MdQWp/RFxdQe58pKn nMSK6JnPswZ1cfW6BQx+G5Lgjy9lk+BtEqY2dEnronWTLSabo9EOPYljX 5vmsDe1ylNvAWgHGLOREpb026lYoijVd3YBVHdiwIzqva1Qlqbo2PgAKy BUBxnyeq2WhDMz4t7vwDKX2/qJfZgJk9BGSiyUcN1myGNJiz9wjqzts4z 60+6/X0VhQqu0IwbCvAQhm61eKFd1yDZ9RJEydfUQ+VwlZv6Qp8t0DzK7 73osIS0TyHfCXmymMhOKZTVQEVym2KdTUlEehgaPPLJufj8qVwN8Ky8gw A==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739492" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739492" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540217" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540217" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:18 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8ABF769F; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Nuno Sa Subject: [PATCH v2 8/8] iio: core: Improve indentation in a few places Date: Fri, 21 Jul 2023 20:00:22 +0300 Message-Id: <20230721170022.3461-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772051857769061681 X-GMAIL-MSGID: 1772051857769061681 Improve an indentation in a few places to increase readability. Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 5c9c68d69fc6..e1293fdbc0ef 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -206,9 +206,9 @@ bool iio_buffer_enabled(struct iio_dev *indio_dev) { struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev); - return iio_dev_opaque->currentmode - & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE | - INDIO_BUFFER_SOFTWARE); + return iio_dev_opaque->currentmode & + (INDIO_BUFFER_HARDWARE | INDIO_BUFFER_SOFTWARE | + INDIO_BUFFER_TRIGGERED); } EXPORT_SYMBOL_GPL(iio_buffer_enabled); @@ -388,8 +388,8 @@ static ssize_t iio_debugfs_read_reg(struct file *file, char __user *userbuf, } iio_dev_opaque->read_buf_len = snprintf(iio_dev_opaque->read_buf, - sizeof(iio_dev_opaque->read_buf), - "0x%X\n", val); + sizeof(iio_dev_opaque->read_buf), + "0x%X\n", val); return simple_read_from_buffer(userbuf, count, ppos, iio_dev_opaque->read_buf, @@ -492,8 +492,7 @@ static ssize_t iio_read_channel_ext_info(struct device *dev, static ssize_t iio_write_channel_ext_info(struct device *dev, struct device_attribute *attr, - const char *buf, - size_t len) + const char *buf, size_t len) { struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); @@ -585,9 +584,9 @@ static int iio_setup_mount_idmatrix(const struct device *dev, ssize_t iio_show_mount_matrix(struct iio_dev *indio_dev, uintptr_t priv, const struct iio_chan_spec *chan, char *buf) { - const struct iio_mount_matrix *mtx = ((iio_get_mount_matrix_t *) - priv)(indio_dev, chan); + const struct iio_mount_matrix *mtx; + mtx = ((iio_get_mount_matrix_t *)priv)(indio_dev, chan); if (IS_ERR(mtx)) return PTR_ERR(mtx); @@ -1025,14 +1024,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, if (chan->modified && (shared_by == IIO_SEPARATE)) { if (chan->extend_name) full_postfix = kasprintf(GFP_KERNEL, "%s_%s_%s", - iio_modifier_names[chan - ->channel2], + iio_modifier_names[chan->channel2], chan->extend_name, postfix); else full_postfix = kasprintf(GFP_KERNEL, "%s_%s", - iio_modifier_names[chan - ->channel2], + iio_modifier_names[chan->channel2], postfix); } else { if (chan->extend_name == NULL || shared_by != IIO_SEPARATE)