From patchwork Wed Sep 30 21:51:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 524653 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 009E1140D69 for ; Thu, 1 Oct 2015 07:53:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=tyjv40EH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932907AbbI3VxM (ORCPT ); Wed, 30 Sep 2015 17:53:12 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:36040 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932769AbbI3VxL (ORCPT ); Wed, 30 Sep 2015 17:53:11 -0400 Received: by wicgb1 with SMTP id gb1so2700095wic.1 for ; Wed, 30 Sep 2015 14:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-type:content-transfer-encoding; bh=9TFDfrrMoVoZOhJ3jOr4lM8YmvHhPL+/FVMzrKBbhjA=; b=tyjv40EHD+o0zc2xTKgkG4LC/QexvEDW5d9G9OD/rmTB8ILtf6RUKIURmtZmwPmLWl 21xu2boKbpVasLKjiAZG+MLCONyhqjiVWAzbOPZIyjxMkdHwrf9WeTQGryeH+dtp8gKE epfsYwGI6p4kA5kN1tlTrDfQRTg+vYYzbSXDJsr0qreSHhF/y50SYO8nzM7b3G826NO1 FbgI+K4GkB7SmF7KKa3TOYgW782/iQ6DWWdg4I/eMKbjjPz0c99hWKzg5s/N7ZBXY9RD 0P+g/LMCcC0XSxY18hs6IzPqWnGepJoqCUsy7PSacePIxdPR6lVkpP7rVFkEXP8moJIR cAiw== X-Received: by 10.180.87.37 with SMTP id u5mr35112747wiz.42.1443649989832; Wed, 30 Sep 2015 14:53:09 -0700 (PDT) Received: from ?IPv6:2003:62:5f55:ba00:b079:1f85:b7fb:839f? (p200300625F55BA00B0791F85B7FB839F.dip0.t-ipconnect.de. [2003:62:5f55:ba00:b079:1f85:b7fb:839f]) by smtp.googlemail.com with ESMTPSA id gt4sm31680694wib.21.2015.09.30.14.53.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Sep 2015 14:53:09 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 2/3] gpio: generic: replace devm_request_mem_region / devm_ioremap with devm_ioremap_resource To: Linus Walleij Cc: linux-gpio@vger.kernel.org Message-ID: <560C594C.7090804@gmail.com> Date: Wed, 30 Sep 2015 23:51:08 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Replace devm_request_mem_region / devm_ioremap with devm_ioremap_resource. Signed-off-by: Heiner Kallweit --- drivers/gpio/gpio-generic.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index eefff1a..0cdbe10 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -582,9 +582,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev, resource_size_t sane_sz, int *err) { - struct device *dev = &pdev->dev; struct resource *r; - resource_size_t start; resource_size_t sz; void __iomem *ret; @@ -602,15 +600,9 @@ static void __iomem *bgpio_map(struct platform_device *pdev, return NULL; } - start = r->start; - if (!devm_request_mem_region(dev, start, sz, r->name)) { - *err = -EBUSY; - return NULL; - } - - ret = devm_ioremap(dev, start, sz); - if (!ret) { - *err = -ENOMEM; + ret = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(ret)) { + *err = PTR_ERR(ret); return NULL; }