From patchwork Tue Feb 21 11:52:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 730466 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vSJzx3Zvbz9s03 for ; Tue, 21 Feb 2017 23:03:25 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vSJzx2rHDzDqxq for ; Tue, 21 Feb 2017 23:03:25 +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-sn1nam01on0068.outbound.protection.outlook.com [104.47.32.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vSJn10P3CzDqJ2 for ; Tue, 21 Feb 2017 22:53:56 +1100 (AEDT) Received: from DM2PR03CA0047.namprd03.prod.outlook.com (10.141.96.46) by CY1PR0301MB0730.namprd03.prod.outlook.com (10.160.159.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Tue, 21 Feb 2017 11:53:50 +0000 Received: from BY2FFO11FD040.protection.gbl (2a01:111:f400:7c0c::173) by DM2PR03CA0047.outlook.office365.com (2a01:111:e400:2428::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13 via Frontend Transport; Tue, 21 Feb 2017 11:53:50 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.919.10 via Frontend Transport; Tue, 21 Feb 2017 11:53:49 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v1LBr3uk009568; Tue, 21 Feb 2017 04:53:47 -0700 From: Madalin Bucur To: Subject: [PATCH 7/9] dpaa_eth: do not ignore port api return value Date: Tue, 21 Feb 2017 13:52:52 +0200 Message-ID: <1487677974-13678-8-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1487677974-13678-1-git-send-email-madalin.bucur@nxp.com> References: <1487677974-13678-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131321516294737548; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39410400002)(39380400002)(39400400002)(39850400002)(39840400002)(39860400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(47776003)(6666003)(50226002)(8676002)(81156014)(50986999)(76176999)(2351001)(104016004)(5003940100001)(8936002)(105606002)(6916009)(36756003)(626004)(33646002)(106466001)(81166006)(356003)(305945005)(5660300001)(43066003)(2950100002)(38730400002)(110136004)(48376002)(53936002)(3450700001)(50466002)(189998001)(8656002)(2906002)(85426001)(4326007)(54906002)(77096006)(68736007)(97736004)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0730; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:jNt5KvoAzzyB/nO/jiX7MUJG9SGT85U4C7aRzuIf49M2ve+tU1a0JNDQqPcd3YTzHY1xTh0GIGm0rY8jIKdyczm+61qWYmoZ6TXtMeKu39poPHHwRdDNrvrq/3jQnLhiQcGWql566AUN9Y+ZCazGmOIibTTBrPDpr+A9WY5dAq3yFNHoCeZKybPtS26MgdwG5939yQnEZAorlHYFU1cDrdXtE3QMi6baMlQCMEqHrDoCu/7AbpkenZqBctLwKaCeZmjEjSFl4ezoKY1PrEJU8CTRicJZlCeEwx1P5PGrGQiktTBXqQmE+y+chiu6oXQpNynGv/KmCIh6QVB+RDVUUY2sFh7G/HaDhxv9BHV3JnHubo+Dbd12xWkii+vXnk+4pXYdQv41vPczaNNANkZQpQeDTjHn9F4vSj0FOz1GywY7P4H2ZCEG3f83MPQk9arudFgMftWz3muDlfm6UNFFEt5mcwzmyN7TEuixbl62dPj210KliANT9I06ZWr9lDCJ2y+VvuN5cuZ/vIuQbNKFRL6AA6IO9Y2lOS6PQmalmmyk6kG8vdKo/FehefDG8h8RiiZMrUdVGHKGbzauxKegF+ZEL0Fmkg/nlZtLJSk7uQOnGcVa8tClzPW1X299dIaZWsvzXBUrAFsCrXxjT3UCluTXjkWxBNIjlqIozTr3ipAKTOaikHZ3zBSLLaqNcfGujSNHQSl/ErII9KVUNYT+Zw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 245b99b7-90c2-4f93-a21a-08d45a504c7e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0730; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0730; 3:pEhdkAO5OoYZNRXkKQ6nwfOlDT3F432X+Wyrm1lwEPDDMx1O0ygf/5DOkTtEmqBe2E6+sSOXio1ZdRFDi9/yMXJctyT7dsEqaZmlaiEx+q+ryymXx8H/SmQ+sdAU6L7HcXJ0NMw8pn8cLUc7db8VhRxf5vW4iWlJoAYzxyc7q+l9FrbkKkxMEQ9OtYNT+B4RDXaJM1RIwgQqcqbMG4O2i299wFlhtK7DfjTsuqLiRIJmUcDPxMPcIKjhAolyDFRplzwpKvTZ09y+88qO/ChDUl8JSH5lHMtE8cXhxiS9Krpj+Euo0mWoofUqexjrNkSb9Ybfcc+ZXE6OVI0+6/I2ARB/8JKKwKq7kgkDkRHfkHSd2rDaTyBRO2hxi5ut0RCY; 25:phHxfcBXdJ3t3R/WEZvLQxWPAo+3yu572tsagq3Pe/mpprK0vQNJtkZIHVDCr7YfGx/1QmwxPlkYHuuxLe2Mz89sxiuJoWVWK70kx/QWQgCMxe/NMk3RL0mG36IBEE9FuIUGZs37FjQSRkjvNfOKcqzjBG+u4afYILhMfWBnjzVx8w/LQjR57bn0Z6SGEjTJBBh5GhqVak286vBaPtIOxvpPI2G2p9ocwjO5i/cWn22LaQpMqFWPVI2+xyDaXyq1ZAYqTXZl8zkXMCDQM4bGUktTa2Rq+p1KGpIA9kBatmiA+KdwyTM8LPH/t2LADIfgQQnEVZW0E3NYli7/rXLHJhLyBCCXrgMqK4nxPjtL+DH4DRlfzH86YrBpBAE2vb51Q2dDtfbAhcKYil+hUuFKN26S4Sa2ti3d91oeqHnW+UnKC4CKlRxAfGqrBqQcjpXKPmsMLx5pJhlTRwrRA1koDg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0730; 31:W0ax0rafWBsOmaxxhKqLLWq1aGyZSEyrhM9R/4Zb2H4as3kPSRDifDrSQRQ9BqckUNT0TrxCkhj/fWf7T3KVK8q2Keq4JO+qiUefBaS4JNAZoEAxD2QmGOIJP/Zd0EtE2lJlPVYvrHA5DCFb1Kj/QRgUMrMAiCcCfHD39NweI8NdccxDqfQ4+pEYEsjKc+HRfou5Nc7Tnk324Qowv4Qnd6wbNRLWZcOm4IG8rV/fXSIjGo6MR6qP0eGxT5QPvntOXP39cnnwUPvN+aWpLmYehmzCImCApzJYiqCW+ezBpo0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13018025)(8121501046)(5005006)(13015025)(13023025)(13024025)(13017025)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123561025)(20161123556025)(20161123559025); SRVR:CY1PR0301MB0730; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0730; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0730; 4:ARKSTK0j23GzGTDs6eosC0yk2nPa24t5x5HwOXBBzoSXsHMG4a2DhTD97PQBZBfG6WE5Lt+s6Lb9UTSSv9Tp+tJwrp8FFb7nf00T+T4+KbRJjfSGydGHltJ43IUu++tk15GDUPigsPsw1JnKx7XuzH79DmZTA0SIEOVzaT81Z3SCEip5QXLHoySF7XdtMmrwDL0BiPgzU2etu+33P3SjqP1EVoEUm8vuR+J9v4lLd0OrWP4k5V4ukcgRKpJyXUHNs8i+6f4/lxW3+VymIMgYHi8QWC/aDZSG0m/Nt/yET3gn51qtKIPYk5Rwn6mcW937TNw9cenp8vXUPxmaMyUsfS/1Oq8GrAGK61plChUyGEEkdkOsy+MR2XeaEUyT5TVOmqdq+33zhwV1vguGF8AZLDpp8vviOMOtBW37g5O8BukCW9ItMozMCJWl/OwuMApbxJHrl5tZ2G8QRN9Y5JtfSuEzsOuTGTM+mtswrLtN1oZnU1I+BP9k4zp5kyk+s94iJT8IfFSM/oAOolA2SucR5C2o7w1+BywIEvrPm9y4G7G7UPeQkitUdDzUa8XRi5Ihf8yCCECXPsTogFctWB0R3ZpsbDwr1snlNgaFW22izyPuAaQE9Aec1XKXL6olfPyHj7MNim8808H3uw/Xbh+c0k2MOCGe/F7mV+9vdCg0kBrpC7Rr7qHDzFCFgTWPIDzx1Jj2HqdEBxtUB9hYJuKlca157AXPCc+viev2ufZnR13eR6oKNwHSpjqx7TKLvFltYy7hnyu6logwN03QliSVQQ== X-Forefront-PRVS: 0225B0D5BC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0730; 23:/WTYaGzL5QEi0hFysBoIF6gyHMnelxc4v9iLBy/?= =?us-ascii?Q?PtbtkWesBLH1mSq6QI4h6Xjc9sbAZUxyF6HjAOuWHpzY1Z5QWdCw8UfxP0jT?= =?us-ascii?Q?ejVx8coDx5sOJbfOS3cOHdOp0fQ2/WGZ12pfC6u+R29m3CSXewbX4VG+mAsq?= =?us-ascii?Q?UFaMmvUoDJ5jm9NnwHFnIxjsdAWfxeapT8VNMt0JvrgtGK7A/TsccGVwJG4m?= =?us-ascii?Q?LYBGSITi5M9JgLtWq97qvwFLwcdunK6Im9woWlimEW1eealxXr16sxdZ9MLC?= =?us-ascii?Q?e35PryNue3AbnpLt19/g+FOY6Fk7FyjLY2C7Hb/9296fa+czP/oA3DmCxtpV?= =?us-ascii?Q?+a4zNy9eVY5cfQRPXWX0Hf5cXKmI1xjNUr9gSRN2Fhw5+ZRvUFRR5R9bbkBF?= =?us-ascii?Q?5rcjIjMU4CCM40vG3Y7CrF+qRLFxuSUi4C1MVbYbSqOM1+5SMCHJmccA4Ov6?= =?us-ascii?Q?bU6zlbdH6uoWjKnbzY2YzZg9rR1eTB5//Zx6ov8kA2gxY8TzjyWrgvQNZpxG?= =?us-ascii?Q?BFoBCnvcWLMwD05vis0nnLLjK4tDfyxik8J6Uaiy5D2kqAQ8+Bp3P5Qw+npo?= =?us-ascii?Q?CAeOlJQ5ltOZhYLMNlfx5HbZhF4CFNYz7Wc4jCRswQLAj0bu7IsfayyCVAII?= =?us-ascii?Q?uz0vUo3Wj99jsL+qQz3O5FUK7Suo5ftwxtokWg3lgkW+YrcH+s0Hwez8RScN?= =?us-ascii?Q?dduOfBtAoiHbrFISJBBftNbIngqb5its8p5yVpE5vpaPeLsUpAQ2bgpW9qc9?= =?us-ascii?Q?Jf5oFO+gU4clbyqqf7c0OY/vh5vD922WHUWYTuoGI359xhZ+iEbagn1wxznA?= =?us-ascii?Q?HbeJNVEC61Vr/aZcQpktpVmbq/FbqldTcHFSNPNIS9pf5hB/BKKmigqdWKgG?= =?us-ascii?Q?0GMgacPBa0DVt7gUm9PY4DdTXAjDKPlNWGh6MLRgrpUoa0Z/sGQ0ahax0XDU?= =?us-ascii?Q?QYB/SxZxMIFs6/G6Jjux2jZZErw2LOJL2ZIahWyNzMNKQA6Qe/OMkPutvVA1?= =?us-ascii?Q?e3eV+lAYQmIoVrGCFOKj9e5gNWd9tG5iPKNWkriWrlyS6g6Ud5ZfZEMVc/4g?= =?us-ascii?Q?aFAAhh1aPDzpAeAzUOkthaOFLGi+ivuid3/agRj9HjcgR9Qq7dzXoLIUkVVn?= =?us-ascii?Q?3zAkT6fjT5s13YGW3tMwBSnjmDLkwvKnlvneIWnAfn+3XhgbfiCCPyv/IMnm?= =?us-ascii?Q?C+Nq1MKOjK/wHghTJmNT4zW/pGICKwTOnWiMB8R8e4lhBgMTJzXivM9wyY2f?= =?us-ascii?Q?dLxNar1YjTlvRbjFdZR+E6hRXolra9dY9WH+UNWywkCaFlevIAKXoUg1lddR?= =?us-ascii?Q?4KJLh3MD3UAflrYcouaWRAuShXtt+Pzsmm6q2v1MNuwTB?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0730; 6:pcCGEm9xyLIjOWxqJERCjc9LYF3hIup4n5nvZlOIfwZq1yJQKGBkArWS9H+k8koBEFBBGnmk1cMlmmMcD0Sk8bWMTsKur//evIbjSm8NnRRXNKSItmawlgMfC1JICPpSHV+QyU28WVBXzRquoYr4l48rXFOCVah+2QXPXV7vrg67GQdnvhGZEng99bk7W16LI8QlRszh4HBLO7xYOsXqYEgpFgesDO0vdugrnvYpzBph9xVtKXW9xRr+GWkmCGMUIwtx7c+rHT/H/UkyTp3J2y9vtySeeFZNwTI56qF79WKutXkMLrKYsaVzTbBfRaiBBly7yG7OTDCO+9V2eXuomrYQ3dZym1INewrGTHZ7hRiBAFwGYY040gl4edf0sa8kH5T/Ps9Q3n46CjkYe3f+csjyZwjcXuJBeQqJmE0aPjg=; 5:ZITVG9GJr04RRfqp9/cY1rUzQe5vAm3UAP5B2eBGfXDQfj5BlRE/sHkI6HsP4CaSzW5xFLsLmdp0V4W1oqeqpdYS+Vkh01ONv42z8rhkQxoByaMWrgpjf8DAWCaUSxi8Obdwl+L8mWVfldQ6t+2KVAG12KyuE242DfUpw/dHrC7qwfdyDDsY1LVLqi+DlTj4; 24:ZGUpU1aVBbPLuI5LDt1ylRWg0Y7Zl90Vb6qYgMMtPkujjiogHBHjmK79VedNQ7wZh+BF63GluzW5dlOmDBTFn7ISWNNFOA3BK81WRridDlY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0730; 7:s2WZ7Moar0tSGOjUtT2GRMjzzQakOnJBOKC0W02uexV8O8/g5siWgNlkLqqInwB/hyFc+wX7GVfSGf7mK0P3XUKQH5+5kHCKUOjH2yL2HmfsQgpPkIttY9ifkC+gvvtk9M1EMqhhRElbRRbQXxlM1lkBhtXVf0zqAwYZXEVDlbg5inFYPWyZnO1W/o51PbgYFcXHKPVglmZNOJwSZeugfx4TSOMPGzzrpWWtlPDVJe5qBG55e1oAlTBkMvxonSXI4b3vXb+NV/pyMkUvncy5gjy7By36RcDY6Vsb+LY+z/5StdJeueccu2KfvAPuT1082WyeOAUBm34P/W1b++gn1w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2017 11:53:49.1461 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0730 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: camelia.groza@nxp.com, Madalin Bucur , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Reported-by: Dan Carpenter Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 65 +++++++++++++++++--------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index a7a595c..ae64cdb 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -1063,9 +1063,9 @@ static int dpaa_fq_free(struct device *dev, struct list_head *list) return err; } -static void dpaa_eth_init_tx_port(struct fman_port *port, struct dpaa_fq *errq, - struct dpaa_fq *defq, - struct dpaa_buffer_layout *buf_layout) +static int dpaa_eth_init_tx_port(struct fman_port *port, struct dpaa_fq *errq, + struct dpaa_fq *defq, + struct dpaa_buffer_layout *buf_layout) { struct fman_buffer_prefix_content buf_prefix_content; struct fman_port_params params; @@ -1084,23 +1084,29 @@ static void dpaa_eth_init_tx_port(struct fman_port *port, struct dpaa_fq *errq, params.specific_params.non_rx_params.dflt_fqid = defq->fqid; err = fman_port_config(port, ¶ms); - if (err) + if (err) { pr_err("%s: fman_port_config failed\n", __func__); + return err; + } err = fman_port_cfg_buf_prefix_content(port, &buf_prefix_content); - if (err) + if (err) { pr_err("%s: fman_port_cfg_buf_prefix_content failed\n", __func__); + return err; + } err = fman_port_init(port); if (err) pr_err("%s: fm_port_init failed\n", __func__); + + return err; } -static void dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps, - size_t count, struct dpaa_fq *errq, - struct dpaa_fq *defq, - struct dpaa_buffer_layout *buf_layout) +static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps, + size_t count, struct dpaa_fq *errq, + struct dpaa_fq *defq, + struct dpaa_buffer_layout *buf_layout) { struct fman_buffer_prefix_content buf_prefix_content; struct fman_port_rx_params *rx_p; @@ -1128,32 +1134,44 @@ static void dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps, } err = fman_port_config(port, ¶ms); - if (err) + if (err) { pr_err("%s: fman_port_config failed\n", __func__); + return err; + } err = fman_port_cfg_buf_prefix_content(port, &buf_prefix_content); - if (err) + if (err) { pr_err("%s: fman_port_cfg_buf_prefix_content failed\n", __func__); + return err; + } err = fman_port_init(port); if (err) pr_err("%s: fm_port_init failed\n", __func__); + + return err; } -static void dpaa_eth_init_ports(struct mac_device *mac_dev, - struct dpaa_bp **bps, size_t count, - struct fm_port_fqs *port_fqs, - struct dpaa_buffer_layout *buf_layout, - struct device *dev) +static int dpaa_eth_init_ports(struct mac_device *mac_dev, + struct dpaa_bp **bps, size_t count, + struct fm_port_fqs *port_fqs, + struct dpaa_buffer_layout *buf_layout, + struct device *dev) { struct fman_port *rxport = mac_dev->port[RX]; struct fman_port *txport = mac_dev->port[TX]; + int err; - dpaa_eth_init_tx_port(txport, port_fqs->tx_errq, - port_fqs->tx_defq, &buf_layout[TX]); - dpaa_eth_init_rx_port(rxport, bps, count, port_fqs->rx_errq, - port_fqs->rx_defq, &buf_layout[RX]); + err = dpaa_eth_init_tx_port(txport, port_fqs->tx_errq, + port_fqs->tx_defq, &buf_layout[TX]); + if (err) + return err; + + err = dpaa_eth_init_rx_port(rxport, bps, count, port_fqs->rx_errq, + port_fqs->rx_defq, &buf_layout[RX]); + + return err; } static int dpaa_bman_release(const struct dpaa_bp *dpaa_bp, @@ -2649,8 +2667,10 @@ static int dpaa_eth_probe(struct platform_device *pdev) priv->rx_headroom = dpaa_get_headroom(&priv->buf_layout[RX]); /* All real interfaces need their ports initialized */ - dpaa_eth_init_ports(mac_dev, dpaa_bps, DPAA_BPS_NUM, &port_fqs, - &priv->buf_layout[0], dev); + err = dpaa_eth_init_ports(mac_dev, dpaa_bps, DPAA_BPS_NUM, &port_fqs, + &priv->buf_layout[0], dev); + if (err) + goto init_ports_failed; priv->percpu_priv = devm_alloc_percpu(dev, *priv->percpu_priv); if (!priv->percpu_priv) { @@ -2683,6 +2703,7 @@ static int dpaa_eth_probe(struct platform_device *pdev) napi_add_failed: dpaa_napi_del(net_dev); alloc_percpu_failed: +init_ports_failed: dpaa_fq_free(dev, &priv->dpaa_fq_list); fq_alloc_failed: qman_delete_cgr_safe(&priv->ingress_cgr);