Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757255Ab1DHORN (ORCPT ); Fri, 8 Apr 2011 10:17:13 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:59204 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756882Ab1DHORL (ORCPT ); Fri, 8 Apr 2011 10:17:11 -0400 From: Jamie Iles To: linux-kernel@vger.kernel.org Cc: linux@arm.linux.org.uk, tglx@linutronix.de, cbouatmailru@gmail.com, grant.likely@secretlab.ca, arnd@arndb.de, nico@fluxnic.net, Jamie Iles Subject: [PATCHv2 4/7] basic_mmio_gpio: request register regions Date: Fri, 8 Apr 2011 15:16:48 +0100 Message-Id: <1302272211-30242-5-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4.2 In-Reply-To: <1302272211-30242-1-git-send-email-jamie@jamieiles.com> References: <1302272211-30242-1-git-send-email-jamie@jamieiles.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2059 Lines: 59 Make sure that we get the register regions with request_mem_region() before ioremap() to make sure we have exclusive access. Signed-off-by: Jamie Iles Acked-by: Anton Vorontsov Cc: Grant Likely --- drivers/gpio/basic_mmio_gpio.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/basic_mmio_gpio.c b/drivers/gpio/basic_mmio_gpio.c index 2b2d384..90f7f89 100644 --- a/drivers/gpio/basic_mmio_gpio.c +++ b/drivers/gpio/basic_mmio_gpio.c @@ -192,6 +192,16 @@ static int bgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) return 0; } +static void __iomem *bgpio_request_and_map(struct device *dev, + struct resource *res) +{ + if (!devm_request_mem_region(dev, res->start, resource_size(res), + res->name ?: "mmio_gpio")) + return NULL; + + return devm_ioremap(dev, res->start, resource_size(res)); +} + static int bgpio_setup_accessors(struct platform_device *pdev, struct bgpio_chip *bgc) { @@ -258,7 +268,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev) if (!bgc) return -ENOMEM; - bgc->reg_dat = devm_ioremap(dev, res_dat->start, dat_sz); + bgc->reg_dat = bgpio_request_and_map(dev, res_dat); if (!bgc->reg_dat) return -ENOMEM; @@ -269,8 +279,8 @@ static int __devinit bgpio_probe(struct platform_device *pdev) resource_size(res_set) != dat_sz) return -EINVAL; - bgc->reg_set = devm_ioremap(dev, res_set->start, dat_sz); - bgc->reg_clr = devm_ioremap(dev, res_clr->start, dat_sz); + bgc->reg_set = bgpio_request_and_map(dev, res_set); + bgc->reg_clr = bgpio_request_and_map(dev, res_clr); if (!bgc->reg_set || !bgc->reg_clr) return -ENOMEM; } else if (res_set || res_clr) { -- 1.7.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/