From patchwork Wed Oct 2 17:02:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1170843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="Y/tPOogz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46k2X56mtXz9sDB for ; Thu, 3 Oct 2019 03:03:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728231AbfJBRDD (ORCPT ); Wed, 2 Oct 2019 13:03:03 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39441 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728092AbfJBRDD (ORCPT ); Wed, 2 Oct 2019 13:03:03 -0400 Received: by mail-wm1-f68.google.com with SMTP id v17so7726469wml.4 for ; Wed, 02 Oct 2019 10:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ssSGrDoEZXjC6vgHTplGH5VegZUKxz/uV2LEv4gtU9A=; b=Y/tPOogzRhUsBcTwTzXUpCbmuvxZ3KvnL73hp9GwV9FY6WfOwPwoqsKTE8vZD4RzHt e/XpWlMT0xwZtFnTrrFm5FIZx+vssgmb7m4HeJe9n9XoOIIIfaOsabQh4R1KFe6jnk3d El/pNBmQqhtIFukCw4X3ui7E0Pd587xFmqR7XeiLK7I1XYpVv9iyxBVffh4zgY0F8C9d noflppDrZkRvrj8ww2YrDcg/Khk1ccnY+kB+R9j9X/nFscAS4oD22dyZb+qEMkml2WNq e8SgA6dNBBJ/p+sUm89G2sN7mwYf56ktUjqM4LJIDdjVippWood/orglHiGVoerjw8tE 8uKQ== 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:mime-version:content-transfer-encoding; bh=ssSGrDoEZXjC6vgHTplGH5VegZUKxz/uV2LEv4gtU9A=; b=PD869NJA5nZs2gTWeDQhzCC9ufrwSzRk+mQ5yJb1b2qxyimCWnffjJqzPmiGiPCC8C Fem7st6+6nbhBgeO06O+xn1dP4RTSlq1fcK527K+dvzYNQZ3NV6+7Dn7s3gmGAaR4iy8 GnsO0vPlusFbBnrRCTGGTjCH769Gb1GhDylKXsadECCt+39JsP2Szl75VFOJ1mmzPhkY e9i+1DoIXXAX2+NLp2CZw/ZVUgqhax2o0YSp8TNgECo/138spNhu/B4zu2FBKI+wIV14 k9bPby53JuCOqlZfS6s2zn8KzTy4NkG5NjrD8FyChSrZevV/Gz6mJkwru4upZDgoMXSK kofw== X-Gm-Message-State: APjAAAVEIVOzt9GfyWPpOVJ5AkFadDkeklnjHlWytOPnGWaUXZGLORnO 1817UI89TQFMifnybPmna5bJXA== X-Google-Smtp-Source: APXvYqxSag048je5/Sf/lXiTUZWfGX0HUpCiIJloHGTbYyS9k10IQQh6x04dsCgii2F1d5i49hUYMA== X-Received: by 2002:a05:600c:2308:: with SMTP id 8mr3867317wmo.67.1570035781189; Wed, 02 Oct 2019 10:03:01 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id b62sm11188575wmc.13.2019.10.02.10.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 10:03:00 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Geert Uytterhoeven , Alban Bedel Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 3/6] gpio: em: use devm_platform_ioremap_resource() Date: Wed, 2 Oct 2019 19:02:46 +0200 Message-Id: <20191002170249.17366-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002170249.17366-1-brgl@bgdev.pl> References: <20191002170249.17366-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski There's no need to use the nocache variant of ioremap(). Switch to using devm_platform_ioremap_resource(). Signed-off-by: Bartosz Golaszewski Reviewed-by: Geert Uytterhoeven --- drivers/gpio/gpio-em.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 620f25b7efb4..674ebebaf90b 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -269,7 +269,7 @@ static void em_gio_irq_domain_remove(void *data) static int em_gio_probe(struct platform_device *pdev) { struct em_gio_priv *p; - struct resource *io[2], *irq[2]; + struct resource *irq[2]; struct gpio_chip *gpio_chip; struct irq_chip *irq_chip; struct device *dev = &pdev->dev; @@ -285,25 +285,21 @@ static int em_gio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, p); spin_lock_init(&p->sense_lock); - io[0] = platform_get_resource(pdev, IORESOURCE_MEM, 0); - io[1] = platform_get_resource(pdev, IORESOURCE_MEM, 1); irq[0] = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq[1] = platform_get_resource(pdev, IORESOURCE_IRQ, 1); - if (!io[0] || !io[1] || !irq[0] || !irq[1]) { + if (!irq[0] || !irq[1]) { dev_err(dev, "missing IRQ or IOMEM\n"); return -EINVAL; } - p->base0 = devm_ioremap_nocache(dev, io[0]->start, - resource_size(io[0])); - if (!p->base0) - return -ENOMEM; + p->base0 = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(p->base0)) + return PTR_ERR(p->base0); - p->base1 = devm_ioremap_nocache(dev, io[1]->start, - resource_size(io[1])); - if (!p->base1) - return -ENOMEM; + p->base1 = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(p->base1)) + return PTR_ERR(p->base1); if (of_property_read_u32(dev->of_node, "ngpios", &ngpios)) { dev_err(dev, "Missing ngpios OF property\n");