From patchwork Wed Mar 28 12:54:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892193 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="TnCqAYmr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7Tv5GJqz9ryk for ; Thu, 29 Mar 2018 00:08:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3E056C22172; Wed, 28 Mar 2018 13:01:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 65A17C21FAE; Wed, 28 Mar 2018 12:58:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7336FC220A0; Wed, 28 Mar 2018 12:51:57 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0046.outbound.protection.outlook.com [104.47.2.46]) by lists.denx.de (Postfix) with ESMTPS id 0D899C220F5 for ; Wed, 28 Mar 2018 12:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=76YCuBy1y7l62vHKuRMPCssDdpH8loCsnJabpGEIkSE=; b=TnCqAYmr4SH2fgK9xgtPRKMEwm1aOH2aqABDW6BmemRUB34Z7tRva2BArQ9R16Sml5rwBthJxRUdHwvDB58PV1Zd7Qolw41T3rDEO7ulrgc6/jOPX7YoniLU5Z/5Ma41RV+aP0vrV++SRk+aOKoiKhSCUw5uTDvHCTiKohHiDVg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:42 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:12 +0800 Message-Id: <20180328125416.28056-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7159f2a3-d7b5-451b-a80c-08d594aaa8b8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:EeyXXVLiuE7CB0DGd3dk0YjrXeXQLlMxPlM0xITDUDZiBcRzsR126050wHbNMN9BwltY8eBvAbFGVdgNyuHwOkswA/Aaf2EZYxCjdUIn6yK/HEbcDRQNZpH0H1zMCmLcpGUOO27WJrUhcQ23HinqpeXfRV3PNzLOymDipOkQO2RpSAumQVugejawWsYRntHDIl5obct+ehTJz9aot1ysqXDcPzZKHmj4zrGg5/kIFb3vJ0b5uRKKQW0l7pPs/9lh; 25:AfPxkudxYf9dPrk1IUZFDqnGW+KN+ExCqLxCZ6tGDjaGok0Mi41eb9o44zlyLTsFkoGHauUVuAUMXqQevsVZhhHBe5SW/f1GfXtGbxZN5pnZIFUvtHpDXz5jecA9OnNQ//9ZjkdsEdXcnZT+7YdXIOTzFfdUT/Fd6R70a6JiHYEOTiBr1GPsxvC+0iREKlX8SQ6t1ddKcUJXPs3NL+buh12VkoA0hFHRwlxpQQViwoyJJ9G96jTzXXrt31YkT/W5Hvm16ZG1tbKdn8DEdoylC9rvqF/IcsZWCl1BrVQGrXz/3sSZuzFhzcqTMeLlZyR6R0rMx3qt5ruJdDFNlAe6fg==; 31:ERUJQ8gnQehMRTYsI/KgfDH0pv1U2+6QxQrzhBmyyzPZm99s0nW5epPjh2hgbahzXUBhMJI6zxNeuKJcV/46OCQ81r1aA6eEJtVuX30rTzi+36SGPNTQ94UaItJWoXXvjdJalVTRwa+xE2GC6WuehXzXL8GlSYHcTPva5/oxn27CPaAo7AtMRj2e/mD7TSlnvHmct0HcU+BMzvFYrjB/Bzhk5ilLesLolRJxUv8Toc4= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:18JYIAr9bxgPaEYPXpbubqSsbs+UCmMc4ncfhiU6VCqd+sZlAKnKk0sCL3SEkqqFq4QyDHJ9+LAUz33xhy7EFrOtvtjKcJudRpgQV3BovrXAXqxTyFjCVLh+C418TL5VJUwCdVBeKpTsvQL6Q6CisHqiPGs1zmtkN53xLjYO51qs+aVWOT2Drm+R3CLULidiETZSVntpgQRyyC6icOOVe/Yp142HUGw69WzgrklHlUlJHxK0nOEiCFhjKYRyB5OpOczXPerFoh/DfMT5cHWBQyaXmmdTaf5YWe5HMRfw3pKcIs/MEikF7cc1oIFLrL9EUYSvun2Ahy4qq91Q2ZnX8rTKM0a3JZH5Y8sCVzlvfIA1Om8ow5IhxDr4IUVpGBXXHQlORO0ns/IErXFXxA3pdVOKxiVrmlZTulu6f/LI51ix3rZOP87/RD+ll136ZbD2hxlcU1Uv4e2ahU7Wv5mn5d4tCe8lCF78RCArM8iZxJwYqo2KwlmxGvMdzTlLdT4f; 4:Qg61VVbL9acHvOElj8lXqR8sa1Ap2hecgKVMRqphFkrkGmSmFfCiyH7H/Tbq2noSzr15pnVmIO2UVZsu6JcZOOSpSMBu/ufAiWolugZrapn/wTu0WGpsIY4yf/PyCJq1738jaj1INK8/hkjbR9VjjOiQmXaq2bojDEh0NNXADDsFUVCfqxVT5Jkaof0xk28uOAayJ+0Rwwa1E527YAdCRZNwwSq6loUsMWz5PunPKkOVIZoz9BeJCMtCgBDqTXOU3zhNSEevZBUoDB6C2/UtpwqD+PBbx7tdHiJ7HbfX/8C8sE+WiOBKXo+/hmarRAG0ZvxT8+9AT0bVFQMp4HnWhp/BrnDJFnmb8b8GKoaFSR0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:JGJGlJwmAmJpEleLgi10FTDr7QmEa8b/KTNYA9TJx?= XLIQtcrDjWZrCr1p/ZicrpMSJLnOhLlg+wLz8R9QAhTobNm1JHMeTQmskrkG68Nb5KNqyzquAMnK7Y+rOAh8T/3Rjeqsj+tAzdaUsvx9YY1Xu2DkIK4c7hNGkRZHAzNUpVaPy6fGjqpgq6pLhkxl/e27QJ7UYc/oweO6EWXS8Irzc1HUPhVzO5vNvMpBz0w42eQf2HHqhjZfY8PNQsqdSBopR+E+xPlHLiCz2w7do9yQPHFwLN5Xsqv9PuQs1nXD/dZZmyUDWqfqpRGdTiYvNCbHCwyBg10dbCUc9tRHKuyjUmzCoJ1j5IjPRVbNDSl4Cl7QJihvOTc7NbM+hO3Jb7CZAa1sKcAn2gRK8B7H2PGVqQRbNuIdG3K57iHVR0Imo1O/Zo1jQLqe9DkzAXZ+BP82NsPV7bMgeqtEVXnOLA5qxz+BzSOvKK6WxwQmZnQlTd18ADq8d8zNNdgh+SCU4pKOtjdhVEMOawYhuciN4p8HnUh3YkgQ8WBCHq9tESpEUcoSscvKoR3plecGN5ejn9vKe8ddp1qgbaqE7LO262fgze8NfmV3aDLG/wmXGSt1znMP4VCegfEBYgd7wZW4n3A++P/BRhsVIxoqEOA0rknoJ4eJ6FFTmtnhTDhtrOF35STsLbi4lK1Isi0oBNkaCAGbZgOqPFj26hpNMDPA+BM1EdXy8gkeTDDc0QuLvmYFYL3LgqNFjvqSG2Doq8lyzQZExoscxc/mvoCp+47NhbLWNtsE/8bBXzQzD7XduEyGMFoYmENyjZTzi++9rx+EQOWZEt9ksXA/dD5Q/2Pl0K6BbepYPO1u0DWpGjXFdu3ew5fokw4kxR7oApd6mRaho821elmfOqyN5eRA7LWgwNfLTfeP1CIFtESZ16Os87sTWBVPqBdBaTxe9L8e3Z/RGwY/yB+cNnJ3CbNMuXtgIhNw38v7aHQ6oyYpkoWqGyGULiC+xqHipLZmteU4LnQ9wcbvIOY2N3HfC65x3GhEPpkeztcICjRs+xhr36/gMJpToIvKBzV48a2HefPfXjSsp0o3p1YAfmU0o+Dtrep+H9qii5aZlZaLWAA8J+oRfo1//4GUYdZmaPECaqpL9+4VByn1jaDQ0uSVmjUwyMg5na2GDVsZ0BR+jK67KrVslnjcX/YYCBmkQFBBU8KY1Qgm+mKVcRqYSnwezjQlAFgmCj5Us1BNigGUCdnQ9HQSp2OUHc= X-Microsoft-Antispam-Message-Info: 7y4YdGGZzkfuyV0dCUx/aCob9TyXshW6u4ekxYU+HV+O99ZoCbpiALsv/uc6AAV/+opv8UnC50H3j/gQ597Ppn/7ahSHmpS3qAO3d4BAzkeFJBBjE0DlX7y95Jtyu3TkavgsJTPFTzU/wvU9+LkASBCnLkwZxC7c8o9kvE6Mmmju7svwjH34PGAtDQn8Nub3 X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:Bb2S/yeekd8sf1XTEFkZHczM9rmWnqzhoxEbzhtkvHgQk/Cee59L8SBZGrMQzALDzWwYuZg9PpaIj9nlrZiEEo+IEDMukbacO4HDnNZosQP5qe4/mLy6lVvbeOvKHbPph04Heobm/p6KD5u8FcxnvGbA1bXXsPND8UgmZE3zuDBDgiGCwA5g7+zY0Yyi/fB8xEyFxUGAfbaNsZV3OCMBVT//auHCdDmYqRJzmLUDL8CY/+0rlkLsJhSDIem+E2E85wT6r0dR6BrSZ+WZgRiIkHgQ+Xd3PHhCbtXFfDPMEGRbiaL9nJvtsRqCE0zwjqAdc1rAl6uWnYQiamlhVegnzioKfpsmuWP5qETUf/lThGnhyj+2G08aEfnzxsTDiynqSvWcYGoNTXxPT0zFKHus+Hgu9qqJU6T5KRmk1utFeL5UO+HGHcWyO2iW1IOXcgYoenbGjU6xVcsI1709LzEW2g==; 5:26XM0sPZFkZ+1gnW1yzpf5InoNSfog8KYa3M42oFfGT0C5M3jXUrKSk/XvqyZT4Cohuq3PwzCyoJr4L/CTERr0B9WDIV5m6CXtDMa2xxFHJZNA65+oMMOFwnGQMZrh65HV9WZfwgp31mj/6+Ej6d5N3TTCNx5cp/lSCHkFGJjCE=; 24:o4VKBh0bnTwtvZk3KFsJMtRQ5aYgqXLnBfL3GXpG51xx6kcOTjR1ksdViaS/bkPtnScuK7PCV6nbC5lic/ACVQf/FeVaVukmJX+j9g5R/Js= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:avyGErmsNoEpsuTzeInSyULZxGa9YH8nT1f6RRg2ajYoHvqrIFr/eewaInG/6j3ita4dY/q9+R/XenGft3Yvw/lnX2NkcxKPW6MElhtCR+uoZieRtkETaIyER8vYGq9RTWUHQzqO/6y+CLAMexEd8UMnFdfamNM+NJQQEqg9wnv0G0TlRQ7GZCDkwSBFIZf/Wb684Agd+f/XY6/4jJ6JXVvU95RChZMV79O25jxkRjgNQ7eX4x0LhKBKEvnPLvEa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:42.2880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7159f2a3-d7b5-451b-a80c-08d594aaa8b8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 2/6] net: fec_mxc: simplify fec_get_miibus X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" No need to provide two prototype for this function. Use ulong for the first parameter, then this function could be shared for DM/non DM case. Signed-off-by: Peng Fan Acked-by: Joe Hershberger --- V3: None V2: Drop uneccessary ulong drivers/net/fec_mxc.c | 15 +++------------ include/netdev.h | 6 +----- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 617e504293..953252a92e 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1011,18 +1011,9 @@ static void fec_free_descs(struct fec_priv *fec) free(fec->tbd_base); } -#ifdef CONFIG_DM_ETH -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id) -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id) -#endif +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id) { -#ifdef CONFIG_DM_ETH - struct fec_priv *priv = dev_get_priv(dev); - struct ethernet_regs *eth = priv->eth; -#else - struct ethernet_regs *eth = (struct ethernet_regs *)(ulong)base_addr; -#endif + struct ethernet_regs *eth = (struct ethernet_regs *)base_addr; struct mii_dev *bus; int ret; @@ -1282,7 +1273,7 @@ static int fecmxc_probe(struct udevice *dev) fec_reg_setup(priv); priv->dev_id = (dev_id == -1) ? 0 : dev_id; - bus = fec_get_miibus(dev, dev_id); + bus = fec_get_miibus((ulong)priv->eth, dev_id); if (!bus) { ret = -ENOMEM; goto err_mii; diff --git a/include/netdev.h b/include/netdev.h index 3958a4cd32..c96f851be0 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -119,11 +119,7 @@ static inline int pci_eth_init(bd_t *bis) return num; } -#ifdef CONFIG_DM_ETH -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id); -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id); -#endif +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id); #ifdef CONFIG_PHYLIB struct phy_device;