From patchwork Tue Mar 1 07:03:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram Dash X-Patchwork-Id: 590374 X-Patchwork-Delegate: yorksun@freescale.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 6EB0C140157 for ; Tue, 1 Mar 2016 18:24:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 18B89A7559; Tue, 1 Mar 2016 08:24:36 +0100 (CET) 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 bXNutGRIzK3S; Tue, 1 Mar 2016 08:24:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 87D48A750A; Tue, 1 Mar 2016 08:24:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4985A750E for ; Tue, 1 Mar 2016 08:03:55 +0100 (CET) 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 ovk1cLYDK3TX for ; Tue, 1 Mar 2016 08:03:55 +0100 (CET) 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-bn1on0087.outbound.protection.outlook.com [157.56.110.87]) by theia.denx.de (Postfix) with ESMTPS id 0BCC3A749F for ; Tue, 1 Mar 2016 08:03:50 +0100 (CET) Received: from DM2PR03CA0047.namprd03.prod.outlook.com (10.141.96.46) by BLUPR03MB311.namprd03.prod.outlook.com (10.141.48.26) with Microsoft SMTP Server (TLS) id 15.1.415.20; Tue, 1 Mar 2016 07:03:48 +0000 Received: from BY2FFO11OLC013.protection.gbl (2a01:111:f400:7c0c::127) by DM2PR03CA0047.outlook.office365.com (2a01:111:e400:2428::46) with Microsoft SMTP Server (TLS) id 15.1.415.20 via Frontend Transport; Tue, 1 Mar 2016 07:03:48 +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 BY2FFO11OLC013.mail.protection.outlook.com (10.1.15.25) with Microsoft SMTP Server (TLS) id 15.1.427.7 via Frontend Transport; Tue, 1 Mar 2016 07:03:47 +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 u2173kcZ024850; Tue, 1 Mar 2016 00:03:47 -0700 Received: by lvd5587.freescale.com (Postfix, from userid 65022120) id DFD586807E; Tue, 1 Mar 2016 12:33:45 +0530 (IST) From: Sriram Dash To: Date: Tue, 1 Mar 2016 12:33:36 +0530 Message-ID: <1456815817-18578-3-git-send-email-sriram.dash@nxp.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1456815817-18578-1-git-send-email-sriram.dash@nxp.com> References: <1456815817-18578-1-git-send-email-sriram.dash@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131012894282537562; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC013; 1:GWyxaPWBihhbluuSD+/8wuZ3kHZRgoHeoBTMQ2uy+4DT46bgYL6wJusbyDVJhDMKa0B6qrJ1Grxm3QN5A91H5TGATGz7GMy5+zqJSmYRRlVGA2nYTfubrF4z9SQ0xcsjQU4MXFWWRihedVvxHPY1Oh5rYIJAMytZ1xddYsFebficjw1SjOgwCIYRGEX2ZxmG5PmCgg6Jty6ywFbv9DWQTAou0mrzk+LuqOAY5MtnlyCCf4JgqQxvf3sHT4HF2CcffDDH9Zcjo3JFWujhlOh5LZ57jYlqf0/RccOjv195wGColP1Wix6vY4WngNWAbZ9ox/ZKGItrbL8tZ0p5TGMQIKj4Igpye9Piv2iNxqrRH6JTg/XbUZL7IRzefTOnS5XSMdU6Y2rkcZxTr102hf5L8xZoiF+myoXzzocIyHCUxF1O9TqSRzIibYvWmtjE7EHWXbKCcaaXd9xBiYlX55ryZMmmLKvZTnXqbUus2E0sgXN15tw5A7LHC098J7e+XX3s8mILjhc9OjewQLx/oPHBI4eqVA1mrSgpJnapqO3R7M6G+NsFOPKeY4ac1JhEKLoVAhazqha8CVCl8VHjp6loyQ== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6039001)(6009001)(2980300002)(428002)(189002)(199003)(36756003)(586003)(1096002)(1220700001)(103686003)(90966002)(48376002)(19580395003)(105586002)(87936001)(19580405001)(86372001)(50466002)(4326007)(2351001)(2906002)(16796002)(42186005)(81156008)(229853001)(52956003)(106466001)(47776003)(110136002)(2950100001)(5003940100001)(50226001)(101416001)(50986999)(33646002)(76176999)(46386002)(92566002)(45336002)(11100500001)(5008740100001)(189998001)(6806005)(5001960100003)(7059030)(42882005)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB311; H:tx30smr01.am.freescale.net; FPR:; SPF:None; MLV:sfv; MX:1; A:0; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 363ba71d-0f71-4813-cf72-08d3419fa318 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB311; 2:+5rVQFuMoU1/9K9817RDK6+KPPrdx1hZFy5upJyehE+1Bl0i5P8fzVWBVgH6wJdaA5ecdFemWmSJDykwaNHxn+OxPvE73QmhBIuKLBUlFqaXlvJy6Vv+y56fCENIijYbjTf91CeV8ZA7QyIw9SgzvitLwhRTShu5eFt50t5oQMpvpTa40sZJyFi1HOlOdbae; 3:ux8zpg2sHUm7NMP09ndPSEtqDlSpHPyXYbshvdQYjfYNof4SkirZtgOIFwT+ZuMCsvhOxrGlWTl4+i2tpTVcuowgXiiTnFk1t7UW6UHC92HtPrBhPqxoalIY4FdE+4lG2w+XKBqpN4xcP23rXk7ffqDb1PeVr4lqtZVsqT+6A6cK/tVL5wPntZR+ZkyM9xowZICRe0WuELrAMbjMgDbNaoIKAwhJ+wydj+y3dvngnkE=; 25:gm6pJwF3GMZyZ3FnpMyBJSW31+IuCOi0mpR4K7M0QYLFxYoNMwQOMFBRshHCpSxNFOmhhGqWMl5jlwnkwul+P+DgB+IkA9DHLrm4H7UuAOmb+h40DpTT2Xz4Wknjwxo5ZdOCQlclULPco7c3XGtf4A8vd9rz5zT8EvtZGpde02GJCvHzW5L5zZLxnluUnYrBLqqcZDdkI5fp2M/MqDCsniPzT66JRqVzWyYKJCtiOIXZV2iKK0Y7Ta+KUXylgtayprs7KikHKghoU7wxsvImWL1IhzoUMKsn8apm6jTlzgbwldWLYb1noYzgpECKiS9PrJ0laKbnQN5DtMpsBageAg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB311; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(8121501046)(13015025)(13018025)(5005006)(13017025)(3002001)(10201501046); SRVR:BLUPR03MB311; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB311; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB311; 4:VWJemv+dwrm4T4bi4IUt6j7HcTfRoXV07anqlyRa0Ghrhglj0bbQ+i+SIFzNbWl2md/P/b9g9ypyT8jCNiXoqDA3kAGBxu9PavVw5xEAa1QFdbJCAGePG5oWxIZdHbAXWa8bXpjkrpQnGd7fPCB9pbUO2euVY+N54Vin64yoNoWXvuwOKc6N53VN7UTd9LwJNMjsyS14FDBL3db1N6gvm0R5EsGXLMNER/5d9GgncWJxyInBPPh3PGQtbAVWRjuqmW9wogW1p228OLnvDmG2ojfa9qF9gi086InHY7D/ckirqDaAvDrD3AehXJF7R+Wr9QxxbdHTOEL0hEllbdvtvziNEkF2tuRPN4/pzsH+mA2cFZE21clBq7CRWQRB3C3g82tpcI7mdPIXJBM8cAB8SDQLozIEOc62r/8bLmsBP5OCKBGS9AO5ta5NnJK1jMdMX1iWIQ7qG3uRrndB/ADXOw== X-Forefront-PRVS: 086831DFB4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB311; 23:lHcXyJ8XJeOB3Pz2NWVXn3ovxmgDOmzEXVMS5HOSCF?= =?us-ascii?Q?lWEXcMc1lSxToha0uEkqe/91kjfw99NTnIfPdSeqRmbReklmjhVidV+Xu0sZ?= =?us-ascii?Q?QYplvjsHkPsZ6oyXkd2L+VDvY2GkcYaetsvDY5eGkiLKjUt5mwEQbEsbg7gw?= =?us-ascii?Q?KvVnIATLbcaUMrSX53hB9u46W0VzubuNXm+Neu2ZJsZNnGdvPm660rcguto7?= =?us-ascii?Q?UwO1x+VyQXQi3uR5G964YOT24l6dDV0QeWSQSY1KoLY6O/5ONqJ6Vuk5PegN?= =?us-ascii?Q?jgNdMhBhPPUE8kd0aGHTAHGDxesFMuSZugFxOEw3p5AXkIBy+wEjkKcBU/Au?= =?us-ascii?Q?TFLKFIhqNQYahFsixo5bZozZ2+6azHGN0aC+Lc9DYDS9sQajtg2WT669/Xcm?= =?us-ascii?Q?gwyKPJhk+htPpKFuL1QC/CUxOIKTs6N6yttqMf8bFZxiQpwecfYTSJ+hi7dW?= =?us-ascii?Q?7mZfWNLP8guyt0F0Iga3Z96ZPRQwjSldwzldVOv+vrnMl3B+5ZiiEMEPApeQ?= =?us-ascii?Q?SChNYArw2+qhPk5Lasp+YA8ZX4rFKFHoBJ9ayqawMre3DxRFJ1Lb9R0FO47i?= =?us-ascii?Q?lM2/jpi3bcYY4K/cRjbJNtMMZGSREeqWskDglVnzjnYEWdJ96hBys4Rffinb?= =?us-ascii?Q?PSNjxyQeURxM+JIXyMaHxDaPCqc/3G+Dgg37kCOTNwLUE6f0jmXzdUIpIcLF?= =?us-ascii?Q?zvg9UQAQtBAIPjGXLB8zAgFlnqvXc3ALvzzspHSjZv0ax0Bug7BiOlKMxHTH?= =?us-ascii?Q?4vDdXqXCyK1OTSaAipPVJPt7aWlu0f0lqMDivS6z3dXNa09/tYikcZPKlG7s?= =?us-ascii?Q?VDQDyHKyi7Yfb9AISnKYgL06l+zMPD2jJrqvsES25102bBV0c6anJiecJfGn?= =?us-ascii?Q?8kSZCB9T13emhK3if+oPFFIT1U5pp8VOulLYdr/m5ObHFKJ3shKIhExmycY7?= =?us-ascii?Q?NMxJALEXJh2Mb0DvhKhfcjpavee2JRalSomsVFABqNeV46JY3o13CgqpOdvb?= =?us-ascii?Q?ljXoOeZCC6QUw8qCUCrULQKc047M14CU+mhQPYcKcrXkzpiYeXRQLhz2gYWb?= =?us-ascii?Q?jBKS6lGfGETgnYk6LSdHHKU5dAYIbvaluwbdJpvmczwtnSYG7Ue/Vbkevz5u?= =?us-ascii?Q?JKyIkDkozl/Mo/w/AqX2Lfh5GgV6wL91TnuSWsCrwp+Hl8UtS9hPRvHX0vsv?= =?us-ascii?Q?cjSWDxmVAAMHshTTRokiduGT6ISABDpxhYoLOTkVJUXnfsxKg+2M2TUA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB311; 5:rdtZWrslp981Tor1oRWLZJv1GoaIsB7bySjd3ry4gtQsWpjcZXOGVjrjiweHa8J62N5MlauKwxK1PSwrE3yUeVKIjGDj9Hs1RKnX7cNW9l9f5PMuwPJJMeSsKk0NLzprPKNbfQKEbD5qWPoxHrh7OQS3XQrtkEF381yfa9aDjk8=; 24:xxSz5pHkfYXzThqv9wGxB26002Sl6b5AVyI9UI1NqiDQkNkpgg6Fjl9drIJxd6wCV2wxDvT/7kWIYazZg/VTeCdEv87scUHmTGd9pYmKzBY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2016 07:03:47.9417 (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: BLUPR03MB311 X-Mailman-Approved-At: Tue, 01 Mar 2016 08:24:33 +0100 Cc: marex@denx.de, Sriram Dash , rajesh.bhagat@nxp.com Subject: [U-Boot] [PATCH v3 2/3] board:freescale:usb: 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: Ramneek Mehresh Signed-off-by: Sriram Dash --- board/freescale/common/usb.c | 72 ++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/board/freescale/common/usb.c b/board/freescale/common/usb.c index 85cb1bf..d815dc1 100644 --- a/board/freescale/common/usb.c +++ b/board/freescale/common/usb.c @@ -18,33 +18,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); @@ -64,32 +76,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) {