From patchwork Tue Apr 5 09:11:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram Dash X-Patchwork-Id: 606353 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qfNQj5YpSz9t0r for ; Tue, 5 Apr 2016 19:11:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 57520B380A; Tue, 5 Apr 2016 11:11:52 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I5PYcbfzYP64; Tue, 5 Apr 2016 11:11:52 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B950B37FC; Tue, 5 Apr 2016 11:11:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF2E8B37E8 for ; Tue, 5 Apr 2016 11:11:37 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9sbQH3XuIehP for ; Tue, 5 Apr 2016 11:11:37 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0057.outbound.protection.outlook.com [157.56.110.57]) by theia.denx.de (Postfix) with ESMTPS id 1581DB37E1 for ; Tue, 5 Apr 2016 11:11:32 +0200 (CEST) Received: from BN3PR0301CA0034.namprd03.prod.outlook.com (10.160.180.172) by BY2PR0301MB0711.namprd03.prod.outlook.com (10.160.63.153) with Microsoft SMTP Server (TLS) id 15.1.447.15; Tue, 5 Apr 2016 09:11:31 +0000 Received: from BN1BFFO11FD051.protection.gbl (2a01:111:f400:7c10::1:107) by BN3PR0301CA0034.outlook.office365.com (2a01:111:e400:4000::44) with Microsoft SMTP Server (TLS) id 15.1.447.15 via Frontend Transport; Tue, 5 Apr 2016 09:11:30 +0000 Authentication-Results: spf=none (sender IP is 192.88.168.50) smtp.mailfrom=lvd5587.freescale.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: None (protection.outlook.com: lvd5587.freescale.com does not designate permitted sender hosts) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD051.mail.protection.outlook.com (10.58.145.6) with Microsoft SMTP Server (TLS) id 15.1.453.6 via Frontend Transport; Tue, 5 Apr 2016 09:11:29 +0000 Received: from lvd5587.freescale.com (lvd5587.ap.freescale.net [10.232.34.77]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u359BSkf011589; Tue, 5 Apr 2016 02:11:29 -0700 Received: by lvd5587.freescale.com (Postfix, from userid 65022120) id E4C0368087; Tue, 5 Apr 2016 14:41:27 +0530 (IST) From: Sriram Dash To: Date: Tue, 5 Apr 2016 14:41:20 +0530 Message-ID: <1459847482-19367-3-git-send-email-sriram.dash@nxp.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1459847482-19367-1-git-send-email-sriram.dash@nxp.com> References: <1459847482-19367-1-git-send-email-sriram.dash@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131043210901567253; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6039001)(6009001)(2980300002)(428002)(189002)(199003)(47776003)(2950100001)(50986999)(5003940100001)(189998001)(1096002)(81166005)(46386002)(86372001)(50226001)(45336002)(16796002)(52956003)(110136002)(90966002)(76176999)(87936001)(50466002)(101416001)(5008740100001)(48376002)(6806005)(1220700001)(586003)(36756003)(230783001)(2906002)(19580395003)(103686003)(19580405001)(960300001)(229853001)(106466001)(2351001)(105586002)(4326007)(33646002)(42186005)(92566002)(7059030)(42882005)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0711; H:tx30smr01.am.freescale.net; FPR:; SPF:None; MLV:sfv; MX:1; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD051; 1:1Jl3MPoQtBpQNlYNJZnitLMjaTXsOTrVD23qs36PSGv1b72yI8DyGpChpZDDxfzF2WNmfMpTaF5HQwvKwunLhr9JMgMUBvoTBk616VHlXYXDYZU78AdNOTKrPlM50t/EJC5/VLGyhtDPYHwgwhadZv5WLPCLZmj7iXBKH2BtowxPCtVaWRBpdOcKH+ahasFlJeW3cwsHJFh9MrfS8Oh8CKu2VqhN6N7figRMpfM2Kd1q6O6K87kGBpJ2Kyi6HRsYLsqGwxwP7NRfEI9lHYQaEc7o8u3c01QQyKXq+hRcMu9+/dqZbqZK9EKaEOiWFjK8R50HjhVdldtHJPe4J1hxJSsw1Un7APpuc6k0Lgt+QQqYR1RK8CodyAwwY8nsK1fqwxPdaqVSu3wdRMBLCyyE5qpD+Zk93nRI8yYDZ033+YGSQsN79FYA+3wN128IynM/N1QZ6ikgsKjnrSneCZqal79/5JzklhLaMq2pF7SYAb//SWrs4+SDCK0Lwtm5UWjAsgYq8Jarv4oKLMdbjmCEA/GkWpAYtfYSq8FZ2uBeYnC4fRPNt+kfMk56BqYBegbKVHDLEStznqK9Yv6AQbcEVci+y1hla/5vypK0ZJuoI4Oe7BYa/UwI6Tvr05B/MNF/z79EfrMavy17VkqHjF25liVMi7kbD/kcloFGNMUepy56l8lS9LC0ABfyj8AHFA3gqSk9ni1HHiwnFIZ/KLGRFg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e048d121-fcf4-4601-55b8-08d35d324678 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0711; 2:GkCng2gQHnayKj8BYGdvAD9BbAAFQxR2yKBiU+ntK3pekTSxJg+cXj1ik1qx21u6feMi3zg1iZP3Oknv0jZsyIkz3dBR7h1cjmmy3IuwlnnlFJsvJ/QyKCc87YRAW4hRAGI1gWHQDftU9c6CSRZy7B+B0spx1jemdSDfLdbydCaxY0tHFeXtqyBdvsPe5otw; 3:u8ysvIF85qlUCoLn66uZwFfGMHoGaCvtlTv+OfiNR5bNXaan6nSPhHlmf94YTV/C+vsV0CCkgFTe+B5H3qzRoLNO/PCvqprMYZmVUKmTa99+TRxT2uhIlAz2wBZcVWdobeexD8muBJCElYSHdMPGZmm6z3s7dciamAnZvFLVewj4aTVtPcmGCKBvw+sowNoW9anazO9YsVOGMGkkj7Gk3F8Xf1bqqjfX/KAOJVZP2DQ=; 25:AyXVWLyvmMTqpO+Ega7LmEmVDWZMCnkCVRte8w029fSUx0lgFUryfJZ3uEssPWTKPtNWLop7krFLnWN6jQIZY4XkYcG/+hq2R2buzScP4tKB4xi+zMkXHIG9tgDmeSeMXsbZCGin+DeddAmfYUypF6nBESln6MbEd2+QjIr3EIY32i0PLo+JVoPtLQegqVfb4Pb7TEuoSGp6zHIJHHLB0lXr0KbcSGqDb0lhaHoPEjlYdPTO9V615SsJ4JR1RCNsa3D7w7rDBAzZDRhEMdtDfgtAmFT43huwp0pUvACr/ptsAG7KOQYBqoY2qpCNobacplHWuz7x0OlnGpz+eMqnjTsrY9mIVL4CdIzaYPom/+s= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0711; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13024025)(13015025)(13017025)(8121501046)(13018025)(5005006)(10201501046)(3002001); SRVR:BY2PR0301MB0711; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0711; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0711; 4:yRlsSt5nGlU6QdCdxIbn3iOiTGQTPzjJTohqZZZF/sYUZDSUP8FMNXq9HINYzReygJ24bOElCJFdsuBPt1jepi9m2tQFf4OgohCVYUy1tr1Jaabp0O46Prcmbz29qZy+0c4AxhT+c5WHD+1y+749yby/CSoKk+MPZ7fXHC7bw939esqovyAXPfBK3BkitesCuT5UGdkuiYiBq8iuKKEBR9ypY7ZJdymvlU0VyLLmaktO/+SqlTRMddKoo3ZhyHB6mZ3IHbiYwUMSXls0XsxjVJsa5UQ1aUCW2NR46anax0ho2QdPjTQxeCFRhLTgdBGhHhbA/fGz9WH3sMq8Fc3Gh1a8+Y52+kd9COwXxgpNozw0PuZS+e+qeT2DZxq3+qV1Urh9rU78SZyz8/uAulUT+1rngg8CpiJzpLjVlHqYDFx1Y4txilC8Cv0i7+RvuS7PfTLN/ccSGNbNXQO8b5a54w== X-Forefront-PRVS: 0903DD1D85 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0711; 23:Uc4YjTzQWWB3U80wbgTheiK8fnwNkrL56YUkz07?= =?us-ascii?Q?6rJTgPTSpOngQjtapToPJnS584XfjAWM+B5qHwB15qA3hKNlCUGZ3us24j0w?= =?us-ascii?Q?Nv80j0tXa2LzERCKU/BotSM0YJD1Yq/FB/OxIqpTNMPREcmEgvWs2pTXCgOu?= =?us-ascii?Q?Uh3VJee2zgQ8M/NzCrxqYRxsrK/ftSTFMPwkkwgpe6F0r87prJZBf5nFrKby?= =?us-ascii?Q?0Zom9GdbssxcN86otK4npWhozFc1ZwH4XZRLOm38A5sX9dOSXZiGjJ+YkCRm?= =?us-ascii?Q?9IiXiQ+bQUQvUXkzX21Gbn5+naKuiXOWRZW9uEDnyjSa7WrhpHcR+JONwzI/?= =?us-ascii?Q?pBtTbV4bYfDGTAMGL56fJuclSBAPEhcrWLX59coRaFFINiwz5F1c8AXt+hoR?= =?us-ascii?Q?Obp6wxanK3+3btoxf6sJUZjoZyrgopQVXQYiCdMGv0H/IeG/X9VOO2UlG/+j?= =?us-ascii?Q?U6g3dQbdS5BLl4Zw+HlMLBMwRnWprNbdWRbZ80s9Rj1WH2BFqbjM1Ps2c7iy?= =?us-ascii?Q?OZ27uF0UQ1Q1KWYGERB3g+2GPwdJ4LwF+hvwc4vMl6tUecQkmQTUIV3XN1LR?= =?us-ascii?Q?2YtdWDyDTarQE5rMIpp9euRdx0GyFNGE34PgzyrSGnqIrRSt2xpeUaM+KOj9?= =?us-ascii?Q?2S1z8uL5J5OAnTYuEqb76gLLjEMBAmL6xpTWbB/8NXQmq5P3SPjOjnxJpD4P?= =?us-ascii?Q?KHIYrH1bO/QpYgLyJ+9RYkbCsvNNAdCvU0YdMpH1fLicDFRkDesD258mpmVV?= =?us-ascii?Q?7Bn80TmuStKEW2twCRWJwxsXN2PX1uMZuB8p5Qk92omZYgDtE25hM4xULP7n?= =?us-ascii?Q?WIgCav68okkUsDFxbiUbIrDALuxy3rjemSX6SlJbWaIbVv9HRd4ab8N0tlwC?= =?us-ascii?Q?j6FIusjXZVvT4kJ84PnRoD5/MQAEbo7ndMDozyMrY8kBpBGpW7PKHBRX3WPl?= =?us-ascii?Q?4Ru4VfLJ3BLRS5ehhtlOGpp6+0i6SKMkJrBi4MQz9yY1PBTdVIG+1jual1Ty?= =?us-ascii?Q?b0/It/2ghaV5X/IERbHPOWEfr6Bq+c/04N8OOuiXprmSwDAlMwKXKcgIGWJc?= =?us-ascii?Q?KUb0pt64DSWbWe1W5B9kEjpOWWtgctnNaVCDjLa3l7rcXtFwzZwp+0CHeqqx?= =?us-ascii?Q?rHMqUhSsueog/KkgG92EYNb0XNYHJh1bHfcJczL1YBz1inlm6zp1JRUomJ+i?= =?us-ascii?Q?E0QmZwc08tRzBbvDSnjP+GmbA1rOIb12yIMyG?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0711; 5:DnqcmTWD/2DCCj8W2TDr5oOgTOhZMkUFrd2kPDKzyHC7sMHfHsFUzuC4vh+TKImAWn7jA9888Ybpht6pCg1tLnz7fnvBtAbE5Cwr62ULRxvojONJM8MddQDfqE+ux6hNg0TdSszKOLWt0Xn+/bIi3i5cbARJPVYLxU233J9nqRU=; 24:hZepGLYRm0zk7lil2BzcQTdSWM2IXqMhMaCatFsnK6r6PI4+IddEZO0r75pXayucFL6RNgrReTaanx33zC7vAsBs+BfPO5z/n4iPr72awsU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2016 09:11:29.9695 (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: BY2PR0301MB0711 Cc: marex@denx.de, Sriram Dash , rajesh.bhagat@nxp.com Subject: [U-Boot] [PATCH v6 2/4] drivers:usb:common:fsl-dt-fixup: Remove code duplication for fdt_usb_get_node_type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Call fdt_usb_get_node_type() from fdt_fixup_usb_mode_phy_type() to avoid code duplication. Signed-off-by: Sriram Dash Signed-off-by: Rajesh Bhagat Acked-by: Marek Vasut --- Changes in v6: - no update. Changes in v5: - reorder the functions and gets rid of the forward declaration Changes in v4: - Make minimal modification to code Changes in v3: - Move the duplication of code to new patch drivers/usb/common/fsl-dt-fixup.c | 72 ++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 92adb46..eb13f12 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -19,33 +19,45 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, - const char *phy_type, int start_offset) +static const char *fdt_usb_get_node_type(void *blob, int start_offset, + int *node_offset) { const char *compat_dr = "fsl-usb2-dr"; const char *compat_mph = "fsl-usb2-mph"; - const char *prop_mode = "dr_mode"; - const char *prop_type = "phy_type"; const char *node_type = NULL; - int node_offset; - int err; - node_offset = fdt_node_offset_by_compatible(blob, - start_offset, compat_mph); - if (node_offset < 0) { - node_offset = fdt_node_offset_by_compatible(blob, - start_offset, - compat_dr); - if (node_offset < 0) { - printf("WARNING: could not find compatible node: %s", - fdt_strerror(node_offset)); - return -1; + *node_offset = fdt_node_offset_by_compatible(blob, start_offset, + compat_mph); + if (*node_offset < 0) { + *node_offset = fdt_node_offset_by_compatible(blob, + start_offset, + compat_dr); + if (*node_offset < 0) { + printf("ERROR: could not find compatible node: %s\n", + fdt_strerror(*node_offset)); + } else { + node_type = compat_dr; } - node_type = compat_dr; } else { node_type = compat_mph; } + return node_type; +} + +static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, + const char *phy_type, int start_offset) +{ + const char *prop_mode = "dr_mode"; + const char *prop_type = "phy_type"; + const char *node_type = NULL; + int node_offset; + int err; + + node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset); + if (!node_type) + return -1; + if (mode) { err = fdt_setprop(blob, node_offset, prop_mode, mode, strlen(mode) + 1); @@ -65,32 +77,6 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, return node_offset; } -static const char *fdt_usb_get_node_type(void *blob, int start_offset, - int *node_offset) -{ - const char *compat_dr = "fsl-usb2-dr"; - const char *compat_mph = "fsl-usb2-mph"; - const char *node_type = NULL; - - *node_offset = fdt_node_offset_by_compatible(blob, start_offset, - compat_mph); - if (*node_offset < 0) { - *node_offset = fdt_node_offset_by_compatible(blob, - start_offset, - compat_dr); - if (*node_offset < 0) { - printf("ERROR: could not find compatible node: %s\n", - fdt_strerror(*node_offset)); - } else { - node_type = compat_dr; - } - } else { - node_type = compat_mph; - } - - return node_type; -} - static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum, int start_offset) {