From patchwork Wed Feb 6 17:01:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: larsi@wh2.tu-dresden.de X-Patchwork-Id: 2105651 Return-Path: X-Original-To: patchwork-spi-devel-general@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by patchwork2.kernel.org (Postfix) with ESMTP id ABD5EDF2A1 for ; Wed, 6 Feb 2013 17:01:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1U38Nd-0004DW-S1; Wed, 06 Feb 2013 17:01:53 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1U38Nc-0004DO-MQ for spi-devel-general@lists.sourceforge.net; Wed, 06 Feb 2013 17:01:52 +0000 X-ACL-Warn: Received: from atlantis.wh2.tu-dresden.de ([141.30.228.39]) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1U38Nb-0006Hj-OI for spi-devel-general@lists.sourceforge.net; Wed, 06 Feb 2013 17:01:52 +0000 Received: from lem-wkst-02.routerb3c0c6.com (p50998852.dip0.t-ipconnect.de [80.153.136.82]) by atlantis.wh2.tu-dresden.de (Postfix) with ESMTPA id C498783A6C0; Wed, 6 Feb 2013 18:01:45 +0100 (CET) From: Lars Poeschel To: poeschel@lemonage.de, grant.likely@secretlab.ca, rob.herring@calxeda.com, rob@landley.net, linus.walleij@linaro.org, devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, spi-devel-general@lists.sourceforge.net Subject: [PATCH 1/2] gpio: mcp23s08: Allow -1 as a legal value for global gpio base Date: Wed, 6 Feb 2013 18:01:57 +0100 Message-Id: <1360170118-11937-2-git-send-email-larsi@wh2.tu-dresden.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360170118-11937-1-git-send-email-larsi@wh2.tu-dresden.de> References: <1360170118-11937-1-git-send-email-larsi@wh2.tu-dresden.de> X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1U38Nb-0006Hj-OI Cc: w.sang@pengutronix.de, ben-linux@fluff.org, linux-i2c@vger.kernel.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net From: Lars Poeschel Explicitly allow -1 as a legal value for the mcp23s08_platform_data->base. This is the special value lets the kernel choose a valid global gpio base number. Signed-off-by: Lars Poeschel --- drivers/gpio/gpio-mcp23s08.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c index 3cea0ea..2afb828 100644 --- a/drivers/gpio/gpio-mcp23s08.c +++ b/drivers/gpio/gpio-mcp23s08.c @@ -483,7 +483,7 @@ static int mcp230xx_probe(struct i2c_client *client, int status; pdata = client->dev.platform_data; - if (!pdata || !gpio_is_valid(pdata->base)) { + if ((!pdata || !gpio_is_valid(pdata->base)) && pdata->base != -1) { dev_dbg(&client->dev, "invalid or missing platform data\n"); return -EINVAL; } @@ -570,7 +570,7 @@ static int mcp23s08_probe(struct spi_device *spi) type = spi_get_device_id(spi)->driver_data; pdata = spi->dev.platform_data; - if (!pdata || !gpio_is_valid(pdata->base)) { + if ((!pdata || !gpio_is_valid(pdata->base)) && pdata->base != -1) { dev_dbg(&spi->dev, "invalid or missing platform data\n"); return -EINVAL; }