From patchwork Thu Jul 20 20:53: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: 123450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3386621vqt; Thu, 20 Jul 2023 14:21:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHKH85fFTJ/bVjlp+mLKqPvUsYZOAzsxK47VI+hvYCLvLiZzeSOtRN+5ENE5sJizoPIWMIp X-Received: by 2002:a17:906:586:b0:98d:e605:2bce with SMTP id 6-20020a170906058600b0098de6052bcemr3285627ejn.46.1689888069699; Thu, 20 Jul 2023 14:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689888069; cv=none; d=google.com; s=arc-20160816; b=osVKAMvAyKZIgNBokPO6KAE0B7IGaW6lYvFmWPD1aTH+fQ+NNSU9fgiJ8QosjL6WG2 ftpEK0ICgOjjtQqzgVHjKAvEAtY/AwrX5gYYAq9mUfc4Dt9odcyU6Q0z9ZwxGn8SAQgd wo6UwspJZuPmTDTcujqlimKE3dAOM6xVyHO2Yp6azAr0q/qvKdj4Qj1/wTOL79EmD/QV 8OhIeGT6ddVzxrpAPxO3NTVePR9x0bTTNi7sdqrMlN1ZT78cVsY8iJMXWMEwzjy8DhyY p/E458i1Ic6lgAe4478/UX4aUelERFZVv1c0Y1GqMteaJrSpuETz6cmyrRofq8cY5Xak xJSg== 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=j9XohHksyipOe5Ed1szhbSIO3snSm0KvwNF8xCk9jAo=; fh=UOk5tC92rpasvTHsS8FNeq1ESsZGN5rcMuNSzha6ebA=; b=CmjoJfcnlYtVHcjOIlZYZVzSqVT9Ypb3dYGfyJd33AjckVhCqKMlik1DVMA8VTDyQ+ E6LmzxOHWLW2rTrEXQeGDg3mXpy+8cn9+0P/swxdoxWtUl3iVs3CiGpLRs/Lvy3bXbRj nSgLe+iOodBmWBgJAYUIRBE/BXOhhg8i+zpnP21lT0R7Nr99GpOe4llviVAdrT1oDkst fhKzW/nlsbssdwf8n43TjiZUGvIDwRIWsjZPTroeeesae0godRoJmzEcq36/q12+mxUJ o2oedmQ8GEJFbUzSoqA9lA3TfVO2au/cb8Z0LisPL4qSWc5ZEXOSn9LWFsXZ3rnvuPeX kuFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BAfh+zvt; 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 q18-20020a170906b29200b00997c44fb391si1249710ejz.401.2023.07.20.14.20.45; Thu, 20 Jul 2023 14:21:09 -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=BAfh+zvt; 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 S230154AbjGTUxb (ORCPT + 99 others); Thu, 20 Jul 2023 16:53:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbjGTUxZ (ORCPT ); Thu, 20 Jul 2023 16:53:25 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED8C5271E; 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=pfv2zMNVzALrxCi0SprgcczDN6aPO4CmhcU5QiAudNo=; b=BAfh+zvtnUMMowZ9gsaM0pbhzSjzIhexmQV6ZxavpwGrv60ViaKP4vsu Nej9d3RSSYXRMVqyTXA9PNWlNB/0phXMFnTldsR187ESTOAeLAUpO0VlV ohnrqeo45MQQyn4ZUALs3DSTAh1OFB6Zd1MeQ9ckKApl/3M3wafXBmtsB NCxMj0Buv3j5AIwVrNPn2hnERW8v1VT6LmXSXLwnxuPoqPKaXArssdaPE OoafJVqWDAlkBNGH6bSFvuK3gNQQalaM03MmwFG0o2y3UQYYjhvLA88Fn hzechwd6IwrLdHa1/mMpfdjYRRbUv+bLJs/5Kd4CzVBmdqma9GDn52vpD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="370459744" X-IronPort-AV: E=Sophos;i="6.01,219,1684825200"; d="scan'208";a="370459744" 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="971169133" X-IronPort-AV: E=Sophos;i="6.01,219,1684825200"; d="scan'208";a="971169133" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 20 Jul 2023 13:53:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5ABE7604; 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 5/8] iio: core: Get rid of redundant 'else' Date: Thu, 20 Jul 2023 23:53:21 +0300 Message-Id: <20230720205324.58702-6-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: 1771976072646000961 X-GMAIL-MSGID: 1771976072646000961 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 --- 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 9753f6552db4..ab9c6db69625 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++; }