From patchwork Tue May 5 09:25:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 467988 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 CBA02140777 for ; Tue, 5 May 2015 19:30:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031591AbbEEJ3t (ORCPT ); Tue, 5 May 2015 05:29:49 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:33170 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031431AbbEEJ0Y (ORCPT ); Tue, 5 May 2015 05:26:24 -0400 Received: by wgin8 with SMTP id n8so175625097wgi.0 for ; Tue, 05 May 2015 02:26:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=hCxMWejSnwK21ygn2rI2WFJqae71P3COeY18rD/fVZY=; b=Evt1o6x363f3m8cW4J1up1RLI5cl1TJO1E/b+vA+ySXEct+pSmAqnJNDmE1TnJcA2J gKajmurvoJ78C6QuLzT+Ar/CWoGGUAn2SReBCaaKngCWicSVujNQjrpcPwaXxImY8H1B CN4wdpyWSxiDU6zAyVkpr3h9HFhN5RLSo1NT//3mi8cXsAZVRMTtsQE8TydfWPpP8zDI ZZVszzPpCRvTKJFgpeqN9ovtZZgwFBg+t7wAetxwC3RDc2WvS2kiD2BfAj9L6nhBDI9S iAJiLXnoZXt95LYvC4IRd7zDRx8uv7ZY1M0n/VNFU0/tKKb9Leoc/iZk0aLze54eiklU nnEw== X-Gm-Message-State: ALoCoQkQYlUNOMVjDvO3E+XI+qsG5xNL05saD4ogWtZkWZ1QqmFJ069F1hfr5V8/dDLEuFU0aFip X-Received: by 10.180.74.144 with SMTP id t16mr2197160wiv.33.1430817982882; Tue, 05 May 2015 02:26:22 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by mx.google.com with ESMTPSA id g14sm24569682wjs.47.2015.05.05.02.26.21 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 05 May 2015 02:26:22 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: Srikanth Thokala , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , monstr@monstr.eu, John Linn , Anirudha Sarangi , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/12] net: axienet: Support phy-less mode of operation Date: Tue, 5 May 2015 11:25:58 +0200 Message-Id: <9f96915ea98cb99b9c437930e08c27d5a00e465e.1430817941.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com> References: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com> In-Reply-To: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com> References: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Srikanth Thokala This patch adds proper checks to handle the PHY-less case. Signed-off-by: Srikanth Thokala Signed-off-by: Michal Simek --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index b1081e1893b0..c6f2ba056c26 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -940,11 +940,10 @@ static int axienet_open(struct net_device *ndev) PHY_INTERFACE_MODE_RGMII_ID); } - if (!lp->phy_dev) { + if (!lp->phy_dev) dev_err(lp->dev, "of_phy_connect() failed\n"); - return -ENODEV; - } - phy_start(lp->phy_dev); + else + phy_start(lp->phy_dev); } /* Enable tasklets for Axi DMA error handling */ @@ -1606,7 +1605,8 @@ static int axienet_of_probe(struct platform_device *op) lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD; lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0); - ret = axienet_mdio_setup(lp, op->dev.of_node); + if (lp->phy_node) + ret = axienet_mdio_setup(lp, op->dev.of_node); if (ret) dev_warn(&op->dev, "error registering MDIO bus\n");