From: Tushar Behera <tushar.behera@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: thierry.reding@gmail.com, patches@linaro.org,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH 07/15] net: fec: Convert to use devm_ioremap_resource
Date: Mon, 10 Jun 2013 17:05:05 +0530 [thread overview]
Message-ID: <1370864113-17895-8-git-send-email-tushar.behera@linaro.org> (raw)
In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org>
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
---
drivers/net/ethernet/freescale/fec_main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index c42c42a..b0d36b7 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1876,17 +1876,17 @@ fec_probe(struct platform_device *pdev)
(pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
- fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+ fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+ if (IS_ERR(fep->hwp)) {
+ ret = PTR_ERR(fep->hwp);
+ goto failed_ioremap;
+ }
+
fep->pdev = pdev;
fep->dev_id = dev_id++;
fep->bufdesc_ex = 0;
- if (!fep->hwp) {
- ret = -ENOMEM;
- goto failed_ioremap;
- }
-
platform_set_drvdata(pdev, ndev);
ret = of_get_phy_mode(pdev->dev.of_node);
--
1.7.9.5
next prev parent reply other threads:[~2013-06-10 11:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` Tushar Behera [this message]
2013-06-12 9:23 ` [PATCH 07/15] net: fec: " David Miller
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
2013-06-10 13:09 ` Marc Kleine-Budde
2013-06-11 3:15 ` Tushar Behera
2013-06-12 3:09 ` 'Greg Kroah-Hartman'
2013-06-12 9:23 ` David Miller
2013-06-13 5:30 ` Tushar Behera
2013-06-13 5:41 ` Sachin Kamat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370864113-17895-8-git-send-email-tushar.behera@linaro.org \
--to=tushar.behera@linaro.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=patches@linaro.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).