From patchwork Fri Oct 24 02:12:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 402722 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 5811D140082 for ; Fri, 24 Oct 2014 13:14:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbaJXCOD (ORCPT ); Thu, 23 Oct 2014 22:14:03 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:57726 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932181AbaJXCOA (ORCPT ); Thu, 23 Oct 2014 22:14:00 -0400 Received: by mail-pd0-f182.google.com with SMTP id y10so561643pdj.27 for ; Thu, 23 Oct 2014 19:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MlTGotPw0KJiCXAQhGvC/5elqbOsdIY866wSWXcPLjo=; b=cygVrMmHzx5gPx+v3+HySKu4fuvaSSZxTiiwtFKOEmFFUsr6smA77yM3BEqi9xih8N N9KnUUDFfkYAAsRw+PYuh0yRo15A/IpL3/vDS2UfYlRGKuQq+6slJo0LePb2Ioc3MORz hbti36II29jArZaW8/1ZIvirHlUGtyCCMkmopvXhyV4LFGV0AQZ8wSMnTlKCJ2UFTzSV pT5cCVaQNA9v0efnWasJpuzoeBLyMbTTPp5d+ALmjpKjIfIeao4N9hKioYOR7AjJMYlf QdqklUQQ+X3NMaGy1+JopbdWzkPLZBw8hs7a/hgW+nFpByVwx9+k13jsiYPKaJM5Nbwd Habw== X-Received: by 10.66.170.46 with SMTP id aj14mr1621830pac.68.1414116840502; Thu, 23 Oct 2014 19:14:00 -0700 (PDT) Received: from bujji.202.153.32.3 ([175.101.63.212]) by mx.google.com with ESMTPSA id xy3sm2603985pbb.38.2014.10.23.19.13.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Oct 2014 19:13:59 -0700 (PDT) From: Varka Bhadram X-Google-Original-From: Varka Bhadram To: netdev@vger.kernel.org Cc: davem@davemloft.net, sergei.shtylyov@cogentembedded.com, Varka Bhadram Subject: [PATCH net-next v3 1/5] ethernet: wiznet: remove unnecessary check Date: Fri, 24 Oct 2014 07:42:06 +0530 Message-Id: <1414116730-4590-2-git-send-email-varkab@cdac.in> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414116730-4590-1-git-send-email-varkab@cdac.in> References: <1414116730-4590-1-git-send-email-varkab@cdac.in> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org devm_ioremap_resource checks platform_get_resource() return value. We can remove the duplicate check here. Signed-off-by: Varka Bhadram --- drivers/net/ethernet/wiznet/w5100.c | 6 ++---- drivers/net/ethernet/wiznet/w5300.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 0f56b1c..70a930a 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -638,14 +638,12 @@ static int w5100_hw_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) - return -ENXIO; - mem_size = resource_size(mem); - priv->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + mem_size = resource_size(mem); + spin_lock_init(&priv->reg_lock); priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE; if (priv->indirect) { diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index f961f14..7974b7d 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c @@ -558,14 +558,12 @@ static int w5300_hw_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) - return -ENXIO; - mem_size = resource_size(mem); - priv->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + mem_size = resource_size(mem); + spin_lock_init(&priv->reg_lock); priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE; if (priv->indirect) {