From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC268C2D0CF for ; Tue, 24 Dec 2019 12:08:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1FDA20706 for ; Tue, 24 Dec 2019 12:08:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="uE46gJYK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727221AbfLXMIJ (ORCPT ); Tue, 24 Dec 2019 07:08:09 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50376 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726157AbfLXMHX (ORCPT ); Tue, 24 Dec 2019 07:07:23 -0500 Received: by mail-wm1-f65.google.com with SMTP id a5so2275215wmb.0 for ; Tue, 24 Dec 2019 04:07:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v1DqF/dTLuCs5Z87qkvcT7Fr54LZA0AK0GHAIFk9wBw=; b=uE46gJYKyRsUUFjmpCZ4sZOGTvtj0ofO6r3wWU5hlYWDKGN16KYcHqGd6wDni4CqRN rswdF8E5TF8ik3/Y21p0v8UkjqL3Ket4z8y3EqtIdA5g/aONzERbJf3u7hm+Lk5QbVYN 27YBD+thBMW8WSfyYnlitlfQExiKE9Gjdp02sKKtkkxd7x6yEWtFWPbOOF63xB4gTb5L rSotYkgQxFvGgUQb3ATbLXBG4n6Xmx/DPrTNC7iJSItw4h5cLDNJgOaPyyVdPiGlCtOP 20KDJ5vEeuWDxONhkOVia/O+RHTYE755Vk3cI691OMsF0slrBXK5h7BEg8c/Zh5y0ugF QlSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v1DqF/dTLuCs5Z87qkvcT7Fr54LZA0AK0GHAIFk9wBw=; b=QArxWDjw1YhfFnU65ybaLs/ajzETD9sB2r4nA2lNkuD/8qJajAotiYmuB545EAvax9 Ol4fAtSgl3FTfCej7UxCE5ofMDJNgcxBMv+k5IIanIQxWdSfr9eVFlyeDHFN/rrY0CpC Eeg3iftmV8wUl9APVAIYzpYSz2g7GWZ0G4SBgn6VjXKCX+XQxlJhZjzzX6lDfE823/K4 Cfg4xXWS5U04U2xgD/whm4aolIcZmH/GBjmXZed5Jh8QrP3YqHxvvdHWqfFZSVwLNG6o oQE9XanF+uVaD2kwGA8ujYPjHDEerCgp47qxdRbD87nfK3ByQwRL1JE4vh0Ovxsmbwjh Ra3A== X-Gm-Message-State: APjAAAUpjGa69Zx/mBlyi/2rWHMuY72YK0w+DGi4wyMN31OfZEWUjrlW QWotKsXU4lCyP1G+XzuBW9Yc9VFQFkk= X-Google-Smtp-Source: APXvYqwugXFAdnC+IYeBEXuUgZf/SVzBxGb8GJ5l4WMawoAq+vKoVp0lk8rPEKM0YXq3d7xmkN+10w== X-Received: by 2002:a7b:cc81:: with SMTP id p1mr4050459wma.62.1577189241474; Tue, 24 Dec 2019 04:07:21 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id s10sm23829210wrw.12.2019.12.24.04.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 04:07:20 -0800 (PST) From: Bartosz Golaszewski To: Kent Gibson , Linus Walleij , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Andy Shevchenko Subject: [PATCH v4 04/13] gpiolib: use gpiochip_get_desc() in linehandle_create() Date: Tue, 24 Dec 2019 13:07:00 +0100 Message-Id: <20191224120709.18247-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191224120709.18247-1-brgl@bgdev.pl> References: <20191224120709.18247-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski Unduplicate the ngpio check by simply calling gpiochip_get_desc() and checking its return value. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko --- drivers/gpio/gpiolib.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 68adbd2179a0..fcec8b090677 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -678,14 +678,13 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip) /* Request each GPIO */ for (i = 0; i < handlereq.lines; i++) { u32 offset = handlereq.lineoffsets[i]; - struct gpio_desc *desc; + struct gpio_desc *desc = gpiochip_get_desc(gdev->chip, offset); - if (offset >= gdev->ngpio) { - ret = -EINVAL; + if (IS_ERR(desc)) { + ret = PTR_ERR(desc); goto out_free_descs; } - desc = &gdev->descs[offset]; ret = gpiod_request(desc, lh->label); if (ret) goto out_free_descs; -- 2.23.0