From patchwork Tue Oct 4 07:32:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 677949 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sp9sM0zjyz9s65 for ; Tue, 4 Oct 2016 18:44:07 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sp9sL4y9PzDrbN for ; Tue, 4 Oct 2016 18:44:06 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0073.outbound.protection.outlook.com [104.47.32.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sp9cv6pGTzDrSm for ; Tue, 4 Oct 2016 18:33:19 +1100 (AEDT) Received: from DM2PR03CA0041.namprd03.prod.outlook.com (10.141.96.40) by CY4PR03MB2437.namprd03.prod.outlook.com (10.168.163.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Tue, 4 Oct 2016 07:33:14 +0000 Received: from BY2FFO11FD053.protection.gbl (2a01:111:f400:7c0c::121) by DM2PR03CA0041.outlook.office365.com (2a01:111:e400:2428::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16 via Frontend Transport; Tue, 4 Oct 2016 07:33:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD053.mail.protection.outlook.com (10.1.15.190) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Tue, 4 Oct 2016 07:33:11 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u947WxJ3022632; Tue, 4 Oct 2016 00:33:09 -0700 From: Madalin Bucur To: Subject: [net-next 06/13] fsl/fman: return a phy_dev pointer from init Date: Tue, 4 Oct 2016 10:32:52 +0300 Message-ID: <1475566379-5078-7-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> References: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131200399934297023; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(50466002)(110136003)(48376002)(105606002)(43066003)(53806999)(50986999)(189998001)(8676002)(6666003)(586003)(6916009)(2950100002)(76176999)(5660300001)(50226002)(86362001)(229853001)(626004)(4720700002)(2351001)(104016004)(33646002)(36756003)(106466001)(19580405001)(19580395003)(87936001)(5003940100001)(4326007)(5890100001)(69596002)(47776003)(3450700001)(85426001)(2906002)(8936002)(356003)(305945005)(97736004)(7846002)(81156014)(77096005)(11100500001)(68736007)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2437; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD053; 1:7hVNgX5ylts5S/rf4VE6UBSPkro8/5DDOsVrTh+z5fMj0C0WPbhKXeuYQy6kAYt4tkzN+noRdJ/TS77svku/DUIMaGNzpSkbyqkRrOSwopB9MTjJevCBUGPsUcoDmMFA9uqyFQKnVnwrrl9+xHy9HlXS088iwZGFFMMY/fIIEH09/ZX2HeyV/IhdhxKbarMyWIcQkSR7yEIvacgo4DC7eAmTSQiWItw8jfGlWKK/UOQ0HCO56shIad6buwoBN1pp7TZ94t6+Ceo/jMQjvMLusDUJ7hw8A+fOz5uhryYPS/bTWJVpc8ky3k0tI+tArBVDmBXE9FKOkhIuQ4Ikq0jiPT+wMjd3bk78ZEDP7hEeg2GS6G6Fjt1mHwxrPZsjzMx03hacYCjqfMilfot+b/qaCqwGdj7IXlfP6AZE9juD1cYnnnPi8EUAMtcQ4AINfXYAfJWo88Ym1xVFfI9uYNKU+5RGVXBJLj3dY3V3ztTIQXjSaaTzzja3FRr5klZv3FdN0uDKEFCpFNweHrr7KwdQTY/YVTNBslyXCNcUpKVsL/XuNUVFEoLCce46r329PdRYel1SIejDK8fcFCwG16FtoYjH4wJdJ/BsQAo5LtweLYC5FbCsEE1gA5m631nbfDze MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 28a5c84e-79f3-4def-a768-08d3ec28b2da X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 2:W2xk6dpI7zFNLSZA3XyCvreDgwJQQrW1CnTMhCtTKsdS3/lgVhkbBsXKhswdJgiPVNS/fX6ciknxoZwx9mu6k0irQFIIVeKOkiI/AItleyHzVXqS7tv6MqlIu7F5DUzMeKbpPs8YkqFMPicuNLfE2NuRBnYX3grJFuZ2XlXikLRS5kn2G7F4nUvQjr3rDUeYfb0RTS+G8J3wyyrl4R3qbg==; 3:z4r1xFJ+0I9hEvbonuK+lap2Fav0q6o5K+sbjUTnbjS6jAKL8Eg3TH9pGinFzXRb6tCaXjATkHVI9Eq0iosFOAxY9/Ye6rldDg1VyxTvrvTdXKuIQRVdtu0LN3X9TL22LqEyWm/ifFHOYPhMVqUCkpKlmKsBzmBG6/GRVCHtffs3bIzH+/qsxdLE8M0eJuEiGgUDtDMIwI1ivvo8BwBLXa5u+3MA5U4wVSYdewrKwAo3bgMaEuO/EUtSn4FNZfs3; 25:iRH+4kRYMiNTdXoPLL3RmzA/CcvL+A8jNV82RRWNHncGIC0dZQ6+/WRKmTkEn5Nt4x4Gm6tLFEx98opVguRuMP8NwojAET04S6vGsPv3koblF0tKSAGlASedLcLP+9EFmw/RktzxcyepmwnoAAJM2pevTy4OJl6tMi7Tsf4aKMZLS0Dufq9FgzYmoszPbQzVejQsJ82NcjvK0mvJeh3vpwggRu9/jbdOuN/8YqAgMvmcX6wfsIu+LhNk5NwgIPDRBHXpMyrvPQiq8Ta4nU5lE4buemaN2k7QyYI5EMCbSL2PuxHbSRs2IIBlbkZye0DmX0UToQzRrearO4Mxmba9kBDxTUx3B57hu7cI4Bw4vf1I3pDx8o0EnKbkn2K2AzXK9v3MbJJ8AURtLPWZ+/WJuDFsWx936jyJyR6vVnbCyI0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR03MB2437; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 31:fC53HC46ZyoIiauL0g/5XRzbNj96Y6PNHYxjuyeD1wdFVY91QHx6ShzlEHbyIbF0oSQXEY9vOy4ZoJZgmlVb3ck5aSlMYtXj+m31oDkqfbvA9rZWWsRAfC+wzuKhOSXe2U41/aSg3psLQTf3R2iPB1Pgd/3vU+6FrezHpA39XSFQ61MKG+gAJXQFqElfWidalolBe9vZ1eyHgiGgbY40Rooz36GJDv7s5ElDitYh0/1cAU3vavHKpEKCq3YTypa7; 4:G9/wjc1IBuc2LeozZWUjaU4Cf427TZ2grsmX3pyvm5TnJL/p/tGGSxJgO47GRZ0hMq4JlgOXRRnpgCIx3QSyhxmvU6yS0P1T0wv32Zw7BZz4XiuZDgyb1tiyzuIQQgGqnCl5VefxbGggjw6MPjycGCzmKdRm/1MKzwGt3pZ9fz2CNSJ+vK8DVNyIzZxwoGVGGAOyaEhcyEXo79M6L6qFR5qr/YgRbGi4pSfo/9gZV3L3ZXVdhGg6eMKgw2m9gtobr3ywE1vpzjNkqi7O0wvrWZB5Ya3CEvo2NBRgbXdI4tlctvHG3eIq0ym8Fik5VMjfxUjRdgM/E6U6pipd7WsI+Eb8yrfD4Rfihc4sd5bB8T2XwUtC1Bvs1yvv9cdYzu7Du2k9neCS3DZg2GeKYVD3+cMNxo2rTo25xxlJqmnrGd6mR7FZWcVgO4Rhmme9eROmA4D2wfjoTBhmm9/KkDg5oHoV+Y72T3chdOYUUxgy1CZHp1yDrDTzqrWnFj5CNO+6gDnW8nZRg8Vo7kNqBcvZ0LlsQelej6nvukW6f8m2KFq2z2PIhr5NvQQTZ1uA8H89ukcRXuoEKCHgc9gbaaKQEw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13018025)(13023025)(8121501046)(13017025)(13024025)(13015025)(5005006)(10201501046)(3002001)(6055026); SRVR:CY4PR03MB2437; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2437; X-Forefront-PRVS: 00851CA28B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2437; 23:7ff/9xQsefNnSLMm5Ke+Q76eq9ImEOVtEI8IPrbqH?= =?us-ascii?Q?mcyJJTeyD3lgNv+7ZSINl8WRtipIHniak1UmABilbfGMVhFOMFg8I5i8m7zs?= =?us-ascii?Q?l5ULFgm3ScSDdji4f12eTB3eACYsJDMh9cILcJX8yCHpzZ88d1rxFluqc/fO?= =?us-ascii?Q?1ugGMKzORHuCcpDxK56FqjnyS59Ho4/g1QQKj6O3LQVNIOl01kXe3jpLeU99?= =?us-ascii?Q?Nuv9nkk2jycSca/pHNs1oV+leALCwwQnb0h+28VRlbsGCPyQJtVsiXgoyd9m?= =?us-ascii?Q?AuRIusB6C60eKoIFDeOQQnQaF174fbwLkYS/UW3nf7rHLKK19+DnkaNk+vVq?= =?us-ascii?Q?VLiKZ/Q1tAmvsFzZf1pB+YQYCeXx0Ov/A1e57tlMpKzU2ifFj0ABBuVUlqoq?= =?us-ascii?Q?ozM4FlV+OOnBX+Z4US9ioINMZWPFuzrjUXBP69JgAl76v2DtINLbC5MzWXA/?= =?us-ascii?Q?iO+ZK1VwvD9mo3BkZ5bYHzazEsGC31WMtqU0Rz87bS3D40lCyWpj5xSW6dC+?= =?us-ascii?Q?KtSLu4TfIWsDFc0IFF0PA1ASYs+gXvOOVsiyyYGnRIJA+Q6lPdq1mMGHXXP3?= =?us-ascii?Q?EJFojNwkdtmV9o9Q1xLPDomGtG2r2UJSlR57lSztPRmOMcyGkrq+13UtWuJO?= =?us-ascii?Q?0aqIeI4mqTzqQLFWa7IOO4UiZIdZBOp6gdLwoJaAV7eS5K0V9f2MLnLK3nlh?= =?us-ascii?Q?Erm4V4MrFbAaZWfmjgLe758y3IwuwAlFpOMEK1zg6KR79wSLbk0qeJfiRAKp?= =?us-ascii?Q?7LlLTgEKpQNIpKBARL4+kQsoXfZBPWUKZpzkN4gzDkSo6jMnijer/pO/7dpI?= =?us-ascii?Q?jndcpyf8pphj4fx1CQpkaAyNrEhrkVJPWbVUGiPztplWLMLeY5B6tDYnkuVx?= =?us-ascii?Q?cvpIUmdaBNZiUS31Bh+qdWKiYMNF7ixiH5MW5EJcde7cy7FUwciZlnuJvYl4?= =?us-ascii?Q?iGcVob81FTOKS+jgFS4Ld6VrTNEyefWkp9Z9RQ5mtV5LzbkK3K88EACGr32L?= =?us-ascii?Q?W82bjSU2E9hSQJz7UB8kpFx4wsEPX4BO9n7wCf7oQcQmgG29FV4XFMOzDLLq?= =?us-ascii?Q?m4j7mTEyfYTMqcvLWhODkbuCHLFBzqEPfSjznU9HdjZPJ3nPviulS3F/nF6e?= =?us-ascii?Q?pGbkHvOuAupOhUZWAsb8abRc5S/1AgLdfgBetR5UKvSKDe16wPMOxRMI8mFX?= =?us-ascii?Q?OT6rpCBbvA7tj0JDV0ZVz1OFcA+A+HX7y/YEJxiYa44zR+4zQYxn7u4UpUXJ?= =?us-ascii?Q?O+4+Mu/DFliQ6YQtAicaBCBoZs5am/QXqyxJuyo+DlKE7SvbflWNAPdNximY?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 6:bXEbPIIlDxbZ6JuuMwrq3+CxAUkCaBg1zsF7/3RwYpAR+RVDNppLZBNRKbmPhxiOnSP5bX/HDImUFi2CrYzSrp8azvgfcZZfN7fK6erbJpF7XsxKmRxhvJtAZymrGF85diZsPNANEDmM1B5V86ahMc6JJyUsAU0J7FD1Wjr7P0m7RAuu+jcTEX1N1bpquYCU+Z1D6mqi5UxOhvp0/0iomKySnQvpcgwmJmeNL+A+ViY8cL++7P3e6GMl5KcnRDCw2l0s6GOU6KReYR1dNb87SX760dLLCLHGLD3ww7ZSWNdJ+6K52mVRX1VzdwU9Etw/; 5:l8x7WRfqea4aq4qzUjgVOyCr2JveIWeWIUfRuTV7XfVqwDblhsrs0f7+V7rS6ilPZFY33Xe8mvIMz6napJPTXNo/h+xff3qXbOuClbu2EqcT8VfuS+h0LUrpUUPV0GxvkYZVKe/dAbzDHtANcpiVDM9NSa/DnAiyprvDFnD+kyFAIk5EqCb2qNU6b8I+dLbk; 24:DS5dExdSTUNyQcvfZR9GMcLV2990YanSnGVDslv+8aEFx3avn9yjkcQ/CA/7q/jBF1lfSYS0Sedfu7XnRwMTcbJDI65wAH/pnJAm+Ws8zwE=; 7:dt63WaNGvmDY9+outyJTG0Fs+zC6mlqm1sFxGdKtsRjoLATlUZINJy3YrTc4bvIrMP259cqWTeBEWM4Ezu0iXWhbJxufONcJbFJYbvuMwEnzAl2sOzwZDikV0cugFqQ36Xn7fWGNwznKn3MtwSI0Q1KRPETJjzpc0fp91kF/SkcYq/zt4Ob0ycJwPYLJsejbBu3RVK2KtCs+zJuimkUDtF/nDnqYz7xr2jtCl2vQPmGpjl+Rq2DQ1ajWA2jnrEGGLKkw+/fm1NHmjW4gZ1wO56YHYT7Nc43WC4ubIHHyHYismImw3SEyruW6taNuAgNFJuGl4iXH30tady5vueIO1Q== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2016 07:33:11.4485 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2437 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: linuxdev.baldrick@gmail.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/fman/mac.c | 22 +++++++++++----------- drivers/net/ethernet/freescale/fman/mac.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index dc04e61..e4378c2 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -469,9 +469,9 @@ static void adjust_link_memac(struct net_device *net_dev) /* Initializes driver's PHY state, and attaches to the PHY. * Returns 0 on success. */ -static int init_phy(struct net_device *net_dev, - struct mac_device *mac_dev, - void (*adj_lnk)(struct net_device *)) +static struct phy_device *init_phy(struct net_device *net_dev, + struct mac_device *mac_dev, + void (*adj_lnk)(struct net_device *)) { struct phy_device *phy_dev; struct mac_priv_s *priv = mac_dev->priv; @@ -480,7 +480,7 @@ static int init_phy(struct net_device *net_dev, priv->phy_if); if (!phy_dev) { netdev_err(net_dev, "Could not connect to PHY\n"); - return -ENODEV; + return NULL; } /* Remove any features not supported by the controller */ @@ -493,23 +493,23 @@ static int init_phy(struct net_device *net_dev, mac_dev->phy_dev = phy_dev; - return 0; + return phy_dev; } -static int dtsec_init_phy(struct net_device *net_dev, - struct mac_device *mac_dev) +static struct phy_device *dtsec_init_phy(struct net_device *net_dev, + struct mac_device *mac_dev) { return init_phy(net_dev, mac_dev, &adjust_link_dtsec); } -static int tgec_init_phy(struct net_device *net_dev, - struct mac_device *mac_dev) +static struct phy_device *tgec_init_phy(struct net_device *net_dev, + struct mac_device *mac_dev) { return init_phy(net_dev, mac_dev, adjust_link_void); } -static int memac_init_phy(struct net_device *net_dev, - struct mac_device *mac_dev) +static struct phy_device *memac_init_phy(struct net_device *net_dev, + struct mac_device *mac_dev) { return init_phy(net_dev, mac_dev, &adjust_link_memac); } diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h index 0211cc9..d7313f0 100644 --- a/drivers/net/ethernet/freescale/fman/mac.h +++ b/drivers/net/ethernet/freescale/fman/mac.h @@ -58,7 +58,8 @@ struct mac_device { bool tx_pause_active; bool promisc; - int (*init_phy)(struct net_device *net_dev, struct mac_device *mac_dev); + struct phy_device *(*init_phy)(struct net_device *net_dev, + struct mac_device *mac_dev); int (*init)(struct mac_device *mac_dev); int (*start)(struct mac_device *mac_dev); int (*stop)(struct mac_device *mac_dev);