From patchwork Sun May 24 02:13:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Welling X-Patchwork-Id: 6470911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 36852C0020 for ; Sun, 24 May 2015 02:18:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78025205BA for ; Sun, 24 May 2015 02:18:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C5DC2043C for ; Sun, 24 May 2015 02:18:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwLRv-0006xC-At; Sun, 24 May 2015 02:15:35 +0000 Received: from mail-ig0-x22d.google.com ([2607:f8b0:4001:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwLQu-0005XN-7B for linux-arm-kernel@lists.infradead.org; Sun, 24 May 2015 02:14:36 +0000 Received: by igbpi8 with SMTP id pi8so15847845igb.1 for ; Sat, 23 May 2015 19:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cKm/xcs2rTSJSGgX3zeFR9NOALs+nKAO5jaBteS9uCc=; b=nDY2Y6Am/z3EP9ygSKMfD4Uj3l+InDGr6k5gj6jpRl1KN+0QNQb0fMvPu7zAI5cRwX M4S5uCpAobXMz0Y1a32tOaiRDUs0a4C/3WK7/YCW1hfHnFOhd9M0eLFS5GbaR6/Cp+v/ FU2V7mBlZm5IZgy7pQZD0VbcpMkJ2uOykl/W4PTFnloVlNz4iQqqNK8Y9b5tAcBCJh0n 9wuSZvBPMqqBM8SRFi3iuOAWipYoOr5UBNVsBp9E1c3lMLfgqIMmaMSGNCMSowCRMHQW xq/5sicyC1u31515SC9EEXxtmVKTAvN7+zBrkBjdnukq3hUEl6IExJxASI8zbQrFqixE LpQw== X-Received: by 10.50.30.69 with SMTP id q5mr15082552igh.11.1432433651080; Sat, 23 May 2015 19:14:11 -0700 (PDT) Received: from localhost.localdomain (74-84-113-14.client.mchsi.com. [74.84.113.14]) by mx.google.com with ESMTPSA id d15sm2847465igo.8.2015.05.23.19.14.09 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 23 May 2015 19:14:10 -0700 (PDT) From: Michael Welling To: broonie@kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] spi: omap2-mcspi: Handle error on gpio_request Date: Sat, 23 May 2015 21:13:45 -0500 Message-Id: <1432433625-23407-5-git-send-email-mwelling@ieee.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1432433625-23407-1-git-send-email-mwelling@ieee.org> References: <20150522122544.GL21391@sirena.org.uk> <1432433625-23407-1-git-send-email-mwelling@ieee.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150523_191432_340219_20951546 X-CRM114-Status: GOOD ( 11.54 ) X-Spam-Score: -0.4 (/) Cc: Michael Welling X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a valid GPIO is specified but cannot be requested by the driver, print a message and error out of omap2_mcspi_setup. Signed-off-by: Michael Welling --- drivers/spi/spi-omap2-mcspi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index c4e21ad..5867384 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1023,9 +1023,12 @@ static int omap2_mcspi_setup(struct spi_device *spi) } if (gpio_is_valid(spi->cs_gpio)) { - if (gpio_request(spi->cs_gpio, dev_name(&spi->dev)) == 0) - gpio_direction_output(spi->cs_gpio, - !(spi->mode & SPI_CS_HIGH)); + ret = gpio_request(spi->cs_gpio, dev_name(&spi->dev)); + if (ret) { + dev_err(&spi->dev, "failed to request gpio\n"); + return ret; + } + gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); } ret = pm_runtime_get_sync(mcspi->dev);