From patchwork Mon Feb 6 12:10:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 724479 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vH5vS0CR6z9s1y for ; Mon, 6 Feb 2017 23:12:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="IJyqntVX"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbdBFMMR (ORCPT ); Mon, 6 Feb 2017 07:12:17 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:38824 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926AbdBFMKt (ORCPT ); Mon, 6 Feb 2017 07:10:49 -0500 Received: by mail-wm0-f43.google.com with SMTP id r141so111216137wmg.1 for ; Mon, 06 Feb 2017 04:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZE873a7aes7gpqh5t5nlu1biFS3XQTx7owgOMapBWac=; b=IJyqntVXOu7yJ31DtxH186x6lB7JzcAi4yrHigISWFI8wlfJ/kQM5C5EEfQ9N5lR4d 4AzKb6v73ti1qlKfsEhpKk71ImN1dvkd55uFlprtGE7LFjNfTndaLY7dkqaoDQrE8Wf/ 8CF0f7M4Px4JQBk6DRLTeOQfSKlIRSvArLpytx+dN46gktERgzDN9Bkt4gU5hOOfVqKd OvXFHv6AesLs+oZpCxuTtMOneG4kLyJcUVOpDSiBXGeQ14cI+Q/l4uQbxeG9OBUv7Gnf uprMW2HR75OYZeTBJ7qCT8lvC5R0QnzY+c98j853eWDNkuWVPhDhjFx+NJnvidkFri4R SV5A== 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; bh=ZE873a7aes7gpqh5t5nlu1biFS3XQTx7owgOMapBWac=; b=htU8P7eC+e7TTDXQMMP1WFBOIDELvk+Aztbtje/DTKBy9F2PjLUtnGq/VVUhDNXRKC F/+7DzCtAkgcaqlPq/8koiKbmS6RMN+xTxyD38mD2ipekrCV5Mit4eRkRZkXKkeXq+J0 rfVU36uRIgATHtJd01DYbKeUQ0/RLvtTu5orpLOLrmz7/C69CAg2zSJTsUCbGjfB4BvI S0ahU/QogvvBizm6d2zeigMtHVMkmQNv/r0dYg7Y71KMH0QXdlVgeF9NRdezCeVRKJEX c8W8+balZUCiu1j27E8DysYwUhP3xp2WBT0EWjWiYkvIUBJE6hBpmy87Gw5AFEOCiCyu OYnA== X-Gm-Message-State: AMke39m9+IPcZN+NTNc16jL/WwSNNYPT3kgTXK0kuqXKJ06C/7esVAo7WmcxsMKyXJ75dN2A X-Received: by 10.28.220.135 with SMTP id t129mr9146176wmg.97.1486383048187; Mon, 06 Feb 2017 04:10:48 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g5sm1178532wrd.0.2017.02.06.04.10.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Feb 2017 04:10:47 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Alexandre Courbot , Bamvor Jian Zhang , Thomas Gleixner Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 2/7] gpio: mockup: code shrink Date: Mon, 6 Feb 2017 13:10:36 +0100 Message-Id: <1486383041-16758-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486383041-16758-1-git-send-email-bgolaszewski@baylibre.com> References: <1486383041-16758-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Moving a couple of lines around allows us to shrink the code a bit while keeping the same functionality. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mockup.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index 5f6ed4b..d425601 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -92,7 +92,6 @@ static int gpio_mockup_add(struct device *dev, const char *name, int base, int ngpio) { struct gpio_chip *gc = &chip->gc; - int ret; gc->base = base; gc->ngpio = ngpio; @@ -107,21 +106,10 @@ static int gpio_mockup_add(struct device *dev, chip->lines = devm_kzalloc(dev, sizeof(*chip->lines) * gc->ngpio, GFP_KERNEL); - if (!chip->lines) { - ret = -ENOMEM; - goto err; - } - - ret = devm_gpiochip_add_data(dev, &chip->gc, chip); - if (ret) - goto err; - - dev_info(dev, "gpio<%d..%d> add successful!", base, base + ngpio); - return 0; + if (!chip->lines) + return -ENOMEM; -err: - dev_err(dev, "gpio<%d..%d> add failed!", base, base + ngpio); - return ret; + return devm_gpiochip_add_data(dev, &chip->gc, chip); } static int gpio_mockup_probe(struct platform_device *pdev) @@ -164,15 +152,14 @@ static int gpio_mockup_probe(struct platform_device *pdev) } if (ret) { - if (base < 0) - dev_err(dev, "gpio<%d..%d> add failed\n", - base, ngpio); - else - dev_err(dev, "gpio<%d..%d> add failed\n", - base, base + ngpio); + dev_err(dev, "gpio<%d..%d> add failed\n", + base, base < 0 ? ngpio : base + ngpio); return ret; } + + dev_info(dev, "gpio<%d..%d> add successful!", + base, base + ngpio); } return 0;