From patchwork Tue May 7 09:49:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 242108 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 0FE302C0176 for ; Tue, 7 May 2013 20:13:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755777Ab3EGKM7 (ORCPT ); Tue, 7 May 2013 06:12:59 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:39935 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754865Ab3EGKM6 (ORCPT ); Tue, 7 May 2013 06:12:58 -0400 Received: by mail-bk0-f46.google.com with SMTP id w5so192305bku.19 for ; Tue, 07 May 2013 03:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=v0k7auNv1irDW8zwIfJkhOMJp1c6h2XY6dhsM5VfxyU=; b=jr9nm3czYlJNCJGMc0gWz7mtJn94BGEbGpvFiX4lWEKo3T/M24ODRL+EfluST2r1bo /EmP54lKcl4MG1QlTNjVp2juRhQRrBCyMFDzIHZJ0BjuLSage8QVMfukU2IsE6dvGGs2 7gjdQLOIlfDG9Um7nGgx6WRlgSaQx5qECoCccXUz2sZrTxqTjkl2fZhghgyIRBA2xrRz uy6VYJGENZ9B7rCXeYXMxPfs4sn09xffH7KxP5+xAJVjKW8IRV6rrrQCLfoimvnot0r7 iGSVR5jBlp1A4RewlaUiuZmM8cANyu+Oue7XF54lrzaEDy3TGVpwi/EDFfebVqsEltIZ LkHw== X-Received: by 10.205.97.10 with SMTP id ci10mr356866bkc.31.1367920184818; Tue, 07 May 2013 02:49:44 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id x5sm6381299bkh.15.2013.05.07.02.49.43 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 02:49:43 -0700 (PDT) Received: from edge.lan (magicgate.lan [192.168.1.1]) by topkick.lan (Postfix) with ESMTPSA id 515975F973; Tue, 7 May 2013 11:49:12 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Grant Likely , Rob Herring , David Miller , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] net: of_mdio: fix behavior on missing phy device Date: Tue, 7 May 2013 11:49:31 +0200 Message-Id: <1367920171-20264-1-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org of_mdiobus_register creates a phy_device even if get_phy_device failed to create it previously. This causes indefinite polling on non-existent PHYs. This fix makes of_mdio_register rely on get_phy_device to properly create the device or fail otherwise. Signed-off-by: Sebastian Hesselbarth --- Cc: Grant Likely Cc: Rob Herring Cc: David Miller Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/of/of_mdio.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 23049ae..d5a57a9 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -84,13 +84,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) phy = get_phy_device(mdio, addr, is_c45); if (!phy || IS_ERR(phy)) { - phy = phy_device_create(mdio, addr, 0, false, NULL); - if (!phy || IS_ERR(phy)) { - dev_err(&mdio->dev, - "error creating PHY at address %i\n", - addr); - continue; - } + dev_err(&mdio->dev, + "cannot get PHY at address %i\n", + addr); + continue; } /* Associate the OF node with the device structure so it