From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754162AbbFOKRH (ORCPT ); Mon, 15 Jun 2015 06:17:07 -0400 Received: from mail-bn1on0143.outbound.protection.outlook.com ([157.56.110.143]:57472 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750885AbbFOKQ7 (ORCPT ); Mon, 15 Jun 2015 06:16:59 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; From: Nikhil Badola To: , CC: , , Nikhil Badola Subject: [PATCH 1/3][v2] drivers:usb:fsl: Replace macros with enumerated type Date: Mon, 15 Jun 2015 15:46:37 +0530 Message-ID: <1434363397-19473-1-git-send-email-nikhil.badola@freescale.com> X-Mailer: git-send-email 1.7.11.7 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD015;1:XM4oT4Jm3ol43NDWvNeP8az2n+j7eK+5gpS4c4ApNSKbI6apnOKkrHwDO70zsfDGkxkB/uBdYMGPYcdDsf4t3scqBnkwe5IOiOhx5iV36yBRE2uSSMF7pFhXpi0XoZnfr33LxifTDQ4ZEfEM5YL8A3oMGxDg0vrmE2vvcudoqh+x7SoB6wusLrbQ2zmDktJU9NyrUkeR7QlWREHlYtfMCcWnhvH84nxcMxmGfYiUOgaZ5K3XF3m90YpSUJ6ozXy1hzWyqbO5m/uL/VcTvpXOk7g8BvabJZ4Cj44D6az7zaKflBzLo5xQGxIkntHC70P4CXzGCVqs4ooVBdIH2IX66jAbuTBVkoFniri6J0nGG94= X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(339900001)(189002)(199003)(189998001)(5001960100002)(107886002)(50466002)(5001920100001)(104016003)(229853001)(85426001)(76506005)(77096005)(87936001)(48376002)(47776003)(105606002)(50226001)(50986999)(106466001)(92566002)(33646002)(19580395003)(19580405001)(36756003)(6806004)(62966003)(575784001)(46102003)(5001770100001)(77156002)(86362001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR0301MB1620;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1620;2:nUAeQzyLg5mzum/oSevf7YpslWNvGkd1/7txN2fo2i9PAxIlRJe71dDOLmAC5d1y;2:6gxX5LVsMgTwIaVyAHVkPkvljDROqnOZOJsiP4cNvTfv8PAZIukw43fOh8vX4m87FWb/yFeLBkS4oaFnhGHR4Qws5mv9Ycuu451GClnbtr0TkTIb7n4H1HSlky+acxM4SG11yn655ALX/P81k1KU7kP7y4hORGk4F2pZGrLopqiP4ASyZK/YIaZ+fjhKpO7GEps/Q57FVsqkCvLMyne1htHXQrd7lMInqDmJ9KnIc+g=;6:avYsqVvx5he5AUW9tDr14nsYhMvTvSvnOqpgtNzG77Eo888BXBC6E7xwKvvM+W7J4HeA1qL4X9b5a7x3Pl7WmgBqhfp04XYOD3JVJSZUCsd3a/fXX5lG1dRcMvBX7MS10rnTDTgcsnQeZQus5+ute2MtXhrifyROgeuDrZG57qxMVrR8fVQZEdmSVOmsJ8xmI0KfAmra0AtIbU453rByu1xIWA+TmLpdv+MfFNBrCA6IPr3IRxH2VjACsbXdxV5N1ORh/IVvokgW8BLTTefNW6U3ldYnT/fi1eyN7LXU59Hl4aVMoZtJfCtJc8bKpOFhUPx9OrTZFdxv3SrbzgkQtw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB1620; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:BLUPR0301MB1620;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB1620; X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1620;3:KyGvY6Q/Nq13tPfDu48xSTbJTpFAymDgYltd1NWHyn257d/wm9oNaNkwD5r4+gm/i8E8XCqt5FvLquoP2aDgSiJbSFxy4bs6tX8Xf4ijEqFLuE3eyP6Jrnhyqc5hxBZUelwbkcy3/uS1dx+uixtL71mdR5TrgtEJrGrZWf3w2YmEI1z1BbaD7+RJipTQvo9x4LrQFSrqCxiJUyZnM+6OB2Hjhbzsak2bJeyrkGyxcP3NcgP/wpvoQmUMVdrLT3xRf/f8uCYXXpginMLBTStyvV9BUi0VhvByHt86KMxcPBdZ2mBuBVKji69x/uPLfsoO X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1620;9:eM4hgYM6sZrb+Guikh7ze45AHqZoDwzfTCLMzKOzsxpHPfHKMSCs9nfVUy6oTrS+eVpixV+f0yCzbCfoWQzPsMkSbyZPWMcInVTD4gyc2OfqUD1BYci5nS9cXgDPcXeEjJlS6z6dXytsOl8r8EsZmOCzMVetabUM9DLLqrmEvVztRvtg2KBioLrPT2WA2ik5Ti0CAzNgI/KBtIHS/kPNkiMPmPV+eaNSI4MaIGy3JaPhrLRA1L989diq6Rb8pplTIdvcc/ULdH7FW+048AZb7dmju/lmBx97YmfcNDH9KvXXKwFJx7uptAktSEK2IX1xBvlPNZoMVY5wkv9Gq/uQ79gymPHEsAvrNl7LGVeUBXnli4Nz6hk2M8RAx6/VG9L3Ce2JAO+0TyuIBvLKuY+U9voSU2NY+2+UdzOaLiW/o8h3H/p0mb7hRkkvhipkYVOljHQoRpEG9vUUxY33eo4aVCZyASv15TEYXhSPpsABrn04N7I6uB5Qv2H+BQrmBVxzNoyAiO08yndwctDvAsQfmyIpnuNUG89oyWGRG2gu5vuz55vOBU9myLFfmjyZfyd74L85i7uWY9SSPkWiiosx40zKKiZN/V1FQmdW0T5blmxzb4YdiV5pB0cql8YtERkGvo5Ocd1vkYh34q4fRBW5/lddTJKukovtlxdaalEEpe8TN+ukx1DqI3eR/DDQIUf7zwPuSMxOzy2DSuXyXRgZsthmOmhFcPiMxt5jiOw8fi6YEg6rxjPIpP5pjdmQAhgqnTzc9Q2gwBwsaVj9NTAqKIAfdAPaRA42z9VPSS/lLXq9GhN9eHYFCgybH3AwO/jZwHAK8EqqOdubXVL26QJ9JoP5+rNpSQ/0raW+yD0q1utKoVTHZUkk94G7pgDFP4vKEs6PB+U4hraP1bgHjEu9Kk1JHvumZSMYwmTrtResPL0= X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1620;3:6b8Zd5hsutKipL9uKKOOh6lF+GLBF/QlGeaZO7rpK6JvVP6nB79ND/A5/9ud9VCZ5q5fIO4i21qcDG6pnI1S/rgHqWog6hrsyFcVOQLoMDzVh4Isdcif72KPQydQtgDzNKhQG1KsyseX+nOW4Cs04g==;10:MYT7n8/Xxgp1ApfXhHP+4/3SxbbbvzhC3+KlhbqIZ/ukDjSnU7wotIFzdnxUNHpyYz9cuPiVZ0JI0SGF83P44rgmQ5lBxJlQfJdjwLHdh4M=;6:wCL4pVU6FNqd+2bv2SIzk2inxKMODJBRTQJR57RtW/gwPAD5nOOHo7xxpX21ipOV X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 10:16:56.3752 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB1620 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace macros with enumerated type to represent usb ip controller version Signed-off-by: Nikhil Badola --- Changes for v2 : - Assigned value to each enumerator - Changed return type of function that returns controller version - Introduced FSL_USB_VER_NONE for invalid controller version drivers/usb/host/fsl-mph-dr-of.c | 8 ++++---- include/linux/fsl_devices.h | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 5e0d600..2195956 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -119,9 +119,9 @@ error: static const struct of_device_id fsl_usb2_mph_dr_of_match[]; -static int usb_get_ver_info(struct device_node *np) +static enum fsl_usb2_controller_ver usb_get_ver_info(struct device_node *np) { - int ver = -1; + enum fsl_usb2_controller_ver ver = FSL_USB_VER_NONE; /* * returns 1 for usb controller version 1.6 @@ -142,7 +142,7 @@ static int usb_get_ver_info(struct device_node *np) else /* for previous controller versions */ ver = FSL_USB_VER_OLD; - if (ver > -1) + if (ver > FSL_USB_VER_NONE) return ver; } @@ -215,7 +215,7 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev) pdata->controller_ver = usb_get_ver_info(np); if (pdata->have_sysif_regs) { - if (pdata->controller_ver < 0) { + if (pdata->controller_ver == FSL_USB_VER_NONE) { dev_warn(&ofdev->dev, "Could not get controller version\n"); return -ENODEV; } diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 2a2f56b..0d4855cd 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -20,11 +20,6 @@ #define FSL_UTMI_PHY_DLY 10 /*As per P1010RM, delay for UTMI PHY CLK to become stable - 10ms*/ #define FSL_USB_PHY_CLK_TIMEOUT 10000 /* uSec */ -#define FSL_USB_VER_OLD 0 -#define FSL_USB_VER_1_6 1 -#define FSL_USB_VER_2_2 2 -#define FSL_USB_VER_2_4 3 -#define FSL_USB_VER_2_5 4 #include @@ -52,6 +47,15 @@ * */ +enum fsl_usb2_controller_ver { + FSL_USB_VER_NONE = -1, + FSL_USB_VER_OLD = 0, + FSL_USB_VER_1_6 = 1, + FSL_USB_VER_2_2 = 2, + FSL_USB_VER_2_4 = 3, + FSL_USB_VER_2_5 = 4, +}; + enum fsl_usb2_operating_modes { FSL_USB2_MPH_HOST, FSL_USB2_DR_HOST, @@ -72,7 +76,7 @@ struct platform_device; struct fsl_usb2_platform_data { /* board specific information */ - int controller_ver; + enum fsl_usb2_controller_ver controller_ver; enum fsl_usb2_operating_modes operating_mode; enum fsl_usb2_phy_modes phy_mode; unsigned int port_enables; -- 1.7.11.7