From patchwork Thu Mar 9 18:56:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 67075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp466015wrd; Thu, 9 Mar 2023 11:07:38 -0800 (PST) X-Google-Smtp-Source: AK7set8JelgsjpZ2/LiLlVL27E9Jr3FnVdtja2Uk2lR0WTq8jI+nE2y3+s/YdRvvWr/CxqpzARt/ X-Received: by 2002:a17:90a:ba0b:b0:237:f18a:7959 with SMTP id s11-20020a17090aba0b00b00237f18a7959mr23243157pjr.25.1678388857942; Thu, 09 Mar 2023 11:07:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678388857; cv=none; d=google.com; s=arc-20160816; b=CrT3r4dXrmOFqHKNzHENDxwU6optKSjhBSey9a93TbJHrPsnRRDeWh+IdYd2nQvM0R tOuB5SvQgNXu39yI+Rmolznq400Md6d4ltLf2CXdy/Agi9zX4ccAyqZvaA9Gb/sZ+23s W3v75jj0Y1W/zpAIHXtpOWYWSoqFFTqDPuT6ktov/HmA45CQ7vBAf3yTkk/A/ySQ1hxV e1XR+jat1ll5Kjrv0k1xek38Wk87GjDUN+afRHCNHpee9ZWtT8fPnaGSYeNuDk7CjDqh f25QrbJtvaU0JJi/RzqmjncblTj+zJAZOG8E6rkmGy7cEtQu7/Pfs6+923FeVmHh6OD/ apnA== 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=0lm8HO5H53y5lwS+5VejcsD1xGEf989LFHI9UmyOugo=; b=ovhYY1f4wD0Oandg2s1Kjbm3Wjz5oC5YHAxNtVdh5N89ILyYQmmmxjq6TbNXj7sBRd tIZJ/DZcQRU9tI8qbZRJcsVjsKEaDazKdIvcrivuKh1nKvTM2l8uivaZkyw/9fiTpqha aGrKzgtP5zhQ4GCSbZcxX19I59yqizoDig7Sd5WgrJbEgMhvog7YrWMNBvgAlw8KtUpZ Fu6eVNZsGAfoMsTZGY95thKNyPup03UMUcGKDZyrvDy6BOJDczFSZwR7OFebN+we5L0r zkVEkSrkPKZDKYp5Swyv4BubbZ7RqU/KTeh5m5z2qM91yMkNtSHQ7titvbXhSo/Fckhu 7xhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=E8d8uGcD; 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 q1-20020a631f41000000b0050324795c32si219568pgm.319.2023.03.09.11.07.24; Thu, 09 Mar 2023 11:07:37 -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=E8d8uGcD; 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 S230527AbjCIS4H (ORCPT + 99 others); Thu, 9 Mar 2023 13:56:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbjCIS4F (ORCPT ); Thu, 9 Mar 2023 13:56:05 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2160637FB; Thu, 9 Mar 2023 10:56:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678388164; x=1709924164; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6hOXmOXtJFVPOFkTP/FI7Gap65pkHG6+MiLkeFpe28A=; b=E8d8uGcDJnAW6R6tMSOcmUG6lGuZNhTc/AqfSdI/tppxT+DhkX7KlJyz vjxHYUl3rTl0f4npAW8s82usFoOe1WjdJhKH3CAyVh3niazl4gKtdqHGl zeWV7lz328jM//LlZoIIbnbHOVVO4bIt1YZNxUB/w458kZErZq+XdrikE ngzGqSMxtVRLK2jXT2PDY6cCG5jDnXgd495TAhZ91tNMrqEtaI1fF8JnN AVPd7OghQKdQ9FgsJglD5AG3k3RNZGO1gxCn7hFhccuCyeW6vEdUwYBz/ eBb4GfZMPeWWDxmnXQzRLEYUFJjNCtyoxD8EojzcFMCfKwFSDwR5SJWwL A==; X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="336550865" X-IronPort-AV: E=Sophos;i="5.98,247,1673942400"; d="scan'208";a="336550865" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2023 10:55:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="1006849488" X-IronPort-AV: E=Sophos;i="5.98,247,1673942400"; d="scan'208";a="1006849488" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 09 Mar 2023 10:55:47 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id ED31D143; Thu, 9 Mar 2023 20:56:31 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 1/1] gpiolib: Remove duplicative check in gpiod_find_and_request() Date: Thu, 9 Mar 2023 20:56:26 +0200 Message-Id: <20230309185626.84997-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 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,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?1759918275484271607?= X-GMAIL-MSGID: =?utf-8?q?1759918275484271607?= The gpiod_find_by_fwnode() already checks for NULL and returns correct error code in case fwnode is invalid. Drop the respective check and assignment in the gpiod_find_and_request(). Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/gpio/gpiolib.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 8ecfe3afde1e..333ccd44e2b2 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3927,13 +3927,10 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer, bool platform_lookup_allowed) { unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT; - struct gpio_desc *desc = ERR_PTR(-ENOENT); + struct gpio_desc *desc; int ret; - if (!IS_ERR_OR_NULL(fwnode)) - desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx, - &flags, &lookupflags); - + desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx, &flags, &lookupflags); if (gpiod_not_found(desc) && platform_lookup_allowed) { /* * Either we are not using DT or ACPI, or their lookup did not