From patchwork Wed Nov 27 13:35:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1201626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="lsmokxWS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47NMGt5V55z9sTK for ; Thu, 28 Nov 2019 00:35:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727216AbfK0Nfq (ORCPT ); Wed, 27 Nov 2019 08:35:46 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37734 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727097AbfK0Nf1 (ORCPT ); Wed, 27 Nov 2019 08:35:27 -0500 Received: by mail-wm1-f66.google.com with SMTP id f129so7522993wmf.2 for ; Wed, 27 Nov 2019 05:35:24 -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=90rmEcHqIRhcxzdKSYRA7QCcxU0JzYE9Vo2kuWKmjpQ=; b=lsmokxWSgSGnB1sFt9+HqrLY9tkt/xgtaUuFxPHus6576V+rgiFPDhEQUqdVxzITlF XGqHrjUM0QnF2BglcFVigQwP8eOceKRFkUcpurb+GEsSRAU8BJgF2ftB0Q+NE831WV6R jhrqEZewUTYZ8VKbzhI+rT0Xmio5K3PCGOHM9UrudVUMqrTufh8kX1MdHZIRBclFu6x3 F6lC1gnkF8R2u39aHSyiQUVmwxo9kLNxzEJsrbwucYlqYXmufLqGzoT4456NmNsrWM60 SYNiOGiJzaQxLNnPh7/fAktljQUpDjQA7stkBwzK4+AxE2GGXHh9u1IOVVpXFowYooLO acCQ== 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=90rmEcHqIRhcxzdKSYRA7QCcxU0JzYE9Vo2kuWKmjpQ=; b=fLWstzlzTvI+fLh5knNTdbZHK8MVZASqL377yu0TIJ61P/tNHQ6Wg3P8WvMQQxEyYV D2T3c72b6UOYOJjU/HYRfyaN8IEYCuRYPkm0CZBuPMjN32N8JTrc84ckbv6T3MgkEoK4 8dS32PsmZKuFCy5fvxYc18YZfTRsZAqdouO9g/c6oywXX/v3u2zE3+MM/5NQLCDVBVtC PUFl9IKKs2bQdZqe0CY7N6k622ZF65+YwWbWYs2xqVzzPQoGOx9lYrUNKHDpW7YBripN nOQmXTsmHSu0qREplLZFC3DuKTPq6B25vHQf0trwCTUsjucoCD6ESMMR5Nl3IT7jHtDl KJkw== X-Gm-Message-State: APjAAAXIzgHToXk22M0cx8t3st4Q6Aj/S/4cCxjWpgC3rBNigyMWkgMn 2wafdMBUDmPRztOBIVPSMbU7bg== X-Google-Smtp-Source: APXvYqyEKbJhNA5wSqMWKJS3HG/CSd1V3ZLl33/JEaEa1okf7X2eLlplHQ9Cy5ys1gohyy+xvZNFpg== X-Received: by 2002:a7b:c5da:: with SMTP id n26mr998905wmk.60.1574861724196; Wed, 27 Nov 2019 05:35:24 -0800 (PST) Received: from debian-brgl.home (lfbn-1-7087-108.w90-116.abo.wanadoo.fr. [90.116.255.108]) by smtp.gmail.com with ESMTPSA id k18sm19663687wrm.82.2019.11.27.05.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 05:35:23 -0800 (PST) From: Bartosz Golaszewski To: Kent Gibson , Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 4/8] gpiolib: use gpiochip_get_desc() in linehandle_create() Date: Wed, 27 Nov 2019 14:35:06 +0100 Message-Id: <20191127133510.10614-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191127133510.10614-1-brgl@bgdev.pl> References: <20191127133510.10614-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@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 --- 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 b3ffb079e323..6ef55cc1188b 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;