From patchwork Mon Feb 24 03:47:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 323438 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 97D022C00D5 for ; Mon, 24 Feb 2014 14:47:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbaBXDrg (ORCPT ); Sun, 23 Feb 2014 22:47:36 -0500 Received: from mail-yh0-f51.google.com ([209.85.213.51]:34332 "EHLO mail-yh0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825AbaBXDrd (ORCPT ); Sun, 23 Feb 2014 22:47:33 -0500 Received: by mail-yh0-f51.google.com with SMTP id t59so4641812yho.24 for ; Sun, 23 Feb 2014 19:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=a0Gfe702Nvl/uj3EOGfk1qKY4/8Z90OnvFUHvsA/tXw=; b=lD2Naek0dLLGscsY0Rb6jfLnpqjBJEcEZcgfBxCs7mBph/9JEhkIisviEuGMWdIoRj RchT2jWdVuRJ31nQCd+8IJhJWkBA5fV7YQ3AmZJRusr24+2n94dYREp6HXDb8LMrujec IpjMeAJdjArc7rbcddemfpwZL7iEDm2P9vYtE7ojKe1l0U9oF/JSB1RevBILdOVZJjI1 WCVSvOXE+z5HBgmBgwbcGKRlo8GO7M04cqQRz82YH7aCV10zddrCM2T3y9Yfhomss25P 6jNBy/pDyWh5ghciNlKI3PMhAYgXtUnE2LHLmE6ONOHW/bIxh3lX/wVKg+h6xhEKF6gX eQ4w== X-Received: by 10.236.21.202 with SMTP id r50mr28143975yhr.140.1393213652992; Sun, 23 Feb 2014 19:47:32 -0800 (PST) Received: from localhost.localdomain ([189.5.16.5]) by mx.google.com with ESMTPSA id 44sm45566951yhp.17.2014.02.23.19.47.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 19:47:32 -0800 (PST) From: Fabio Estevam To: davem@davemloft.net Cc: f.fainelli@gmail.com, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH v2] net: bcmgenet: Use devm_ioremap_resource() Date: Mon, 24 Feb 2014 00:47:24 -0300 Message-Id: <1393213644-11081-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam According to Documentation/driver-model/devres.txt, devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() instead. Signed-off-by: Fabio Estevam Acked-by: Florian Fainelli --- Changes since v1: - Fix subject drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 0ebc297..844e081 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2481,10 +2481,9 @@ static int bcmgenet_probe(struct platform_device *pdev) } r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->base = devm_request_and_ioremap(&pdev->dev, r); - if (!priv->base) { - dev_err(&pdev->dev, "can't ioremap\n"); - err = -EINVAL; + priv->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(priv->base)) { + err = PTR_ERR(priv->base); goto err; }