From patchwork Mon Feb 24 03:45:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 323436 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 BC1962C00D5 for ; Mon, 24 Feb 2014 14:45:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752456AbaBXDpx (ORCPT ); Sun, 23 Feb 2014 22:45:53 -0500 Received: from mail-yk0-f177.google.com ([209.85.160.177]:48615 "EHLO mail-yk0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380AbaBXDpw (ORCPT ); Sun, 23 Feb 2014 22:45:52 -0500 Received: by mail-yk0-f177.google.com with SMTP id q200so13046424ykb.8 for ; Sun, 23 Feb 2014 19:45:51 -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=AohUjDAaMR2mbuKymycFw73hOvB77hRM03C+afq/tYI=; b=GyxrzGvG/zF6llUZDBLjN5vvucCCm+ZfdbYSCeP7i6fRrqafp8Q/d/9vxtKJK1BIsr /NgEbDHIUxHlTd4hR32pEgCENytS9e4HOwzpVFOlUdWYab0A5R5A98ApnYd0XgfhJaGj LLWJ2vV6/i/egSV/O9bqmo/Xqn9m7QIRYZ6KzeHp/EJpqTT79lRKYZRqoaJVb78Ck1rH 5TCbdxX7T90tDvKhYtJh/+sOwlv0IuBWR2GjuZLGPe8CwmojydJVW2kGsG9TnoFWhS3J d6pW2Wcnm41dvgPBi5FD9CuW6ync6ohmnxPp+zgUGGqdVQ1ZRpJUHZHxWY9n/1q3ZLPC vxvw== X-Received: by 10.236.43.9 with SMTP id k9mr28045513yhb.51.1393213551669; Sun, 23 Feb 2014 19:45:51 -0800 (PST) Received: from localhost.localdomain ([189.5.16.5]) by mx.google.com with ESMTPSA id 57sm45582693yhl.4.2014.02.23.19.45.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 19:45:51 -0800 (PST) From: Fabio Estevam To: davem@davemloft.net Cc: f.fainelli@gmail.com, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH] netdeprecated: Use devm_ioremap_resource() Date: Mon, 24 Feb 2014 00:45:41 -0300 Message-Id: <1393213541-11033-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 --- 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; }