From patchwork Wed Apr 16 15:19:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 339623 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 849AF1400EA for ; Thu, 17 Apr 2014 01:19:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161720AbaDPPTi (ORCPT ); Wed, 16 Apr 2014 11:19:38 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:53367 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161706AbaDPPTg (ORCPT ); Wed, 16 Apr 2014 11:19:36 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so8973588eek.36 for ; Wed, 16 Apr 2014 08:19:35 -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=yjK53GbAPLVmvYsK07KscQz7LajYE3cgGrGJi6rw1dI=; b=iMFq9Fhj4rNje7awwDsH1EdGKp7GzcpERvaCW6ZE8+OrWiDmL+nb8R2pYSJzvCp8YV ZjMxPiA8yQ13/DOOrVWMhqAMzO1IGioNIIA9vq6KoB6Zdy2p8l10dMGx57J4TSJz5/EA L+IkCo5+Ht1Ixpoc2nr7ibEQDW4HA1cXKqKGKxhuvm+SBDVVUdIHlc7mClMAMyWmo+1i eiaug9On6SgDydxrEAL6X6lxXhSrEmDFqpzI2ID5j1m0m5deDZTwP0jTiwbdxdmhzAoO +7FTyC6/adz2GJuVyWBxAcD18LD2Ya/JBLi2rlQbA9vLIihCzIBH/ejlk4ckoJZJ4Djv Xhkg== X-Received: by 10.15.51.1 with SMTP id m1mr5972110eew.25.1397661575141; Wed, 16 Apr 2014 08:19:35 -0700 (PDT) Received: from tamtam.localdomain (p5099deeb.dip0.t-ipconnect.de. [80.153.222.235]) by mx.google.com with ESMTPSA id 44sm58835155eek.30.2014.04.16.08.19.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Apr 2014 08:19:34 -0700 (PDT) From: Daniel Mack To: netdev@vger.kernel.org, f.fainelli@gmail.com Cc: davem@davemloft.net, mugunthanvnm@ti.com, ujhelyi.m@gmail.com, Daniel Mack Subject: [PATCH net-next RESEND 2/2] net: phy: at803x: use genphy_config_init() Date: Wed, 16 Apr 2014 17:19:13 +0200 Message-Id: <1397661553-22117-2-git-send-email-zonque@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1397661553-22117-1-git-send-email-zonque@gmail.com> References: <1397661553-22117-1-git-send-email-zonque@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the generic bits from genphy_config_init() instead of implementing the same functionality again. Signed-off-by: Daniel Mack Reviewed-by: Florian Fainelli --- Resending this after 3.15-rc1 has been released, assuming that the net-next tree is now open again. drivers/net/phy/at803x.c | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index bc71947..850171f 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -141,41 +141,11 @@ static int at803x_resume(struct phy_device *phydev) static int at803x_config_init(struct phy_device *phydev) { - int val; int ret; - u32 features; - - features = SUPPORTED_TP | SUPPORTED_MII | SUPPORTED_AUI | - SUPPORTED_FIBRE | SUPPORTED_BNC; - - val = phy_read(phydev, MII_BMSR); - if (val < 0) - return val; - - if (val & BMSR_ANEGCAPABLE) - features |= SUPPORTED_Autoneg; - if (val & BMSR_100FULL) - features |= SUPPORTED_100baseT_Full; - if (val & BMSR_100HALF) - features |= SUPPORTED_100baseT_Half; - if (val & BMSR_10FULL) - features |= SUPPORTED_10baseT_Full; - if (val & BMSR_10HALF) - features |= SUPPORTED_10baseT_Half; - - if (val & BMSR_ESTATEN) { - val = phy_read(phydev, MII_ESTATUS); - if (val < 0) - return val; - - if (val & ESTATUS_1000_TFULL) - features |= SUPPORTED_1000baseT_Full; - if (val & ESTATUS_1000_THALF) - features |= SUPPORTED_1000baseT_Half; - } - phydev->supported = features; - phydev->advertising = features; + ret = genphy_config_init(phydev); + if (ret < 0) + return ret; if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) { ret = phy_write(phydev, AT803X_DEBUG_ADDR,