netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Varka Bhadram <varkabhadram@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Varka Bhadram <varkab@cdac.in>
Subject: [PATCH net-next v2 5/6] ethernet: renesas: remove unnecessary check
Date: Thu, 23 Oct 2014 07:28:50 +0530	[thread overview]
Message-ID: <1414029531-5067-6-git-send-email-varkab@cdac.in> (raw)
In-Reply-To: <1414029531-5067-1-git-send-email-varkab@cdac.in>

devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.

Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
 drivers/net/ethernet/renesas/sh_eth.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 60e9c2c..ffb49f3 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2769,10 +2769,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
 	/* get base addr */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (unlikely(res == NULL)) {
-		dev_err(&pdev->dev, "invalid resource\n");
-		return -EINVAL;
-	}
 
 	ndev = alloc_etherdev(sizeof(struct sh_eth_private));
 	if (!ndev)
@@ -2781,8 +2777,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 	pm_runtime_enable(&pdev->dev);
 	pm_runtime_get_sync(&pdev->dev);
 
-	/* The sh Ether-specific entries in the device structure. */
-	ndev->base_addr = res->start;
 	devno = pdev->id;
 	if (devno < 0)
 		devno = 0;
@@ -2806,6 +2800,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 		goto out_release;
 	}
 
+	/* The sh Ether-specific entries in the device structure. */
+	ndev->base_addr = res->start;
+
 	spin_lock_init(&mdp->lock);
 	mdp->pdev = pdev;
 
-- 
1.7.9.5

  parent reply	other threads:[~2014-10-23  1:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-23  1:58 [PATCH net-next v2 0/6] cleanup on resource check Varka Bhadram
2014-10-23  1:58 ` [PATCH net-next v2 1/6] ethernet: wiznet: remove unnecessary check Varka Bhadram
2014-10-23  1:58 ` [PATCH net-next v2 2/6] " Varka Bhadram
2014-10-23 12:23   ` Sergei Shtylyov
2014-10-23  1:58 ` [PATCH net-next v2 3/6] ethernet: apm: xgene: " Varka Bhadram
2014-10-23  1:58 ` [PATCH net-next v2 4/6] ethernet: marvell: " Varka Bhadram
2014-10-23  1:58 ` Varka Bhadram [this message]
2014-10-23 12:29   ` [PATCH net-next v2 5/6] ethernet: renesas: " Sergei Shtylyov
2014-10-24  2:15     ` Varka Bhadram
2014-10-23  1:58 ` [PATCH net-next v2 6/6] ethernet: samsung: sxgbe: " Varka Bhadram

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=1414029531-5067-6-git-send-email-varkab@cdac.in \
    --to=varkabhadram@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=varkab@cdac.in \
    /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).