From patchwork Tue Apr 5 09:15:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 8748931 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B6ABC9F36E for ; Tue, 5 Apr 2016 09:16:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2689A2035D for ; Tue, 5 Apr 2016 09:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AA972034F for ; Tue, 5 Apr 2016 09:16:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932530AbcDEJQP (ORCPT ); Tue, 5 Apr 2016 05:16:15 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:15037 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932156AbcDEJQO (ORCPT ); Tue, 5 Apr 2016 05:16:14 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 05 Apr 2016 18:16:13 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 29B974842F; Tue, 5 Apr 2016 18:16:13 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 26D562806E; Tue, 5 Apr 2016 18:16:13 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 205FC2806D; Tue, 5 Apr 2016 18:16:13 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAC24021; Tue, 5 Apr 2016 18:16:13 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="208481259" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 05 Apr 2016 18:16:12 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=aWfZhPNZzk7hvP4CXGwR46cGtDTzBXuvjcik4gDr+YI=; b=CvbXIaX96sIaWYjdZO1ekp9IqZXWusRHpC4u8sf6NYlO15neHyYQ8P8IRPkLZYYMl2NMGExCiLHmnC/kpQzNGJzHKj0LIAohxt2SzA5crpAZC+26GGMpLY5BIUemofXd3XdyjHgffiImSFDwvZJN/Dego+lk25W/FTCmQW1IYqo= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from localhost (211.11.155.144) by SIXPR06MB0921.apcprd06.prod.outlook.com (10.162.173.13) with Microsoft SMTP Server (TLS) id 15.1.447.15; Tue, 5 Apr 2016 09:16:11 +0000 From: Yoshihiro Shimoda To: CC: , , , Yoshihiro Shimoda Subject: [PATCH/RFC 3/5] usb: renesas_usbhs: change function call orfer in usbhsf_dma_prepare_push() Date: Tue, 5 Apr 2016 18:15:47 +0900 Message-ID: <1459847749-5336-4-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1459847749-5336-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1459847749-5336-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0030.jpnprd01.prod.outlook.com (10.164.162.140) To SIXPR06MB0921.apcprd06.prod.outlook.com (10.162.173.13) X-MS-Office365-Filtering-Correlation-Id: f369c6c9-5be1-4882-fc85-08d35d32ee21 X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 2:1rkqJXtrouw3ELNVzTzwt6IChUr56EYUf9SBBIFt9swYGE9VzD2vwB1FMTbd+rKKebQRPTlmwrzoIYO0z28NNk1nynqVtOR37XoXmXrmuJ2RRKX1XaEDVsl+EbdKUSeJI5eFOEilbh3borzXnU2vACSzhUu+/Hkxb5BVTr+QLVBkOpHUoxErJQb1rzB7JUmp; 3:DiO059k2MhdmDbWlmyYNj4z2JWPCNX9BUJTs5SopCdwqS3lHdGiBobBLtCuJJvnmm9V5NUlxUmbSkZSUo/EINLkLslXNIYT47LBQaq+l7lQTqDPmJ99oLDM8MuF/yXkx; 25:CHiW0BP9hn8geCOlRI5Ck9XlIRiWp+0ASWNhtbzjUt5/Mj7P96OC+QktRVc/0LksZy+6szXDqaaDU6E91FDwgXtRDYJxlJEVdwHP7AHJ6r3wKW9IH0RLpjleO/VIrohFlmPtTAnvftjXk+dxpjQFW1Cn8CpLIq0Wk9Fozn/lmK7SOxf67N5pYdKLchzk5maimG427RbSJcAy1qvbdcM5PZfWk7OAz85rIbTqPd+aqITW6J9Iqe6SN8t6kqX4RkG6SL6nI71yuomrz80whRoC5FixkwdBJE+GkvpjS2LbnkXmKEVkRBf3I5UbQ/zTlrPXGrhZEMraKTmwWwNo8cJj9w31YWpMTnc92ukRLZIgWCM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0921; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 20:KIOKv9JgHUNKZBxZuKuPO1KiJre2e9T2eZpwhRp+LEbAk6gz6prRt/5D9hx4qTQMJ/G2OUkN3vyFq1PZWdKtazhV7GfZ9omLi6Il+sfSw0h5TzM0WLJaNvNlChqluz0EkwvyKZPGKPFua7ZXf8Qgadv6wWNeLBG5Few/1OpYTaUBxYeiaGaVvEHeoYHiiULXkv6jfAyGd2pmH7OB1fIPgwBpViBppP9LHPDqshsqQILWChESfR02wdgskzfvQ7HjkL42wvctydqOiVAABClg/57hMma4xStyY6oJYY389Qz7csYsG9egOIJF+08TRhCOzdriK2ND+JgtVFdkuAUcCt7J2XRyBSEtkUyHSxvK8oX4HL4m1uWCzhqesL1CgwuBla1ypJ9zbs9ImR/0yHX+3wQEzwDzjkqthBBvDBkSSfaKoaf1yPSYkpTYVDxCWtXynOYBocAYyYAkoMoox+b/YfuKSc7YiOLYwIIVhutB5UjFon7MmvhmsAoo3CqGCYs7; 4:OYUiEuUfytrKY4BQMus7NJCq1zj2etGrzPObSC17NORNxGOvx+1D2QoRDuNe8Ekzmg2MPx7P3ZJ8aCzSal6Ap3DtGJnIRJkUynzdWVWH0Sk2S6D437j3N0jfjPOV7NIFjbExLhY98yIRntqKgjeRfd4sbM7lRPj25gFJ3C6vEgTokvsV/5WamnGgxLYRl3sk+58v20X8KhnlaXV7NQtFKRu1uWVSQvjfrWofMHbzKy/0lIsGRJ8bO8sYIROwnbVrE6ZhrjcJ+GUg+d8UYqjAnCKPVunBPRhlBEBnfGjnx5ktKMSejdFM5eSE/kLZNXHhiqcgfKQGDDe2CqGgmuJB9DByzS/VhUjq3Tpm8JbrblbDP/MnHAh1RhRslaLdWfaq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:SIXPR06MB0921; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0921; X-Forefront-PRVS: 0903DD1D85 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6069001)(48376002)(5008740100001)(4326007)(5003940100001)(66066001)(47776003)(50226001)(1096002)(78352003)(81166005)(4001430100002)(5004730100002)(36756003)(6116002)(3846002)(586003)(50466002)(2906002)(2950100001)(42186005)(42382002)(189998001)(19580395003)(19580405001)(76506005)(77096005)(92566002)(2351001)(110136002)(229853001)(33646002)(107886002)(76176999)(50986999); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0921; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0921; 23:341MvVGWUDPZPDjY88vDSRwuAGspis15dBjKpllnY?= =?us-ascii?Q?xVEgM2PnTnWVamhj7MZ2TCV12fRAjTe+vQfqzsYtMsrwPERduKW5e+gttJiH?= =?us-ascii?Q?hSDlkqCGNdWmzzaY3M0wMvOXjvyXM8DeFdLzmZXEWmufSmbJhd710mjwbeRs?= =?us-ascii?Q?6PIEXZRbSXsRFiUsrqz0km3YEZY9IUBeBgRf1D3lnUK8U5z3RvDyq77J3rBr?= =?us-ascii?Q?Ar7zTns16/eSSQizHsEeDN5zXzlzqyaRX41Kj8UZ1piCnody4yxYpJsBpOLd?= =?us-ascii?Q?/2V5tghESL+px0DF6GEsNRO/gv1+2pUyuUrikgUrDjBAEfIZ7yqwiLrdPHT9?= =?us-ascii?Q?qLajkefUwKqZTtz7lx6Z8llebnfFjaWkl4CA6azP+nKghAsyvgKiTl/eCI2v?= =?us-ascii?Q?QxFpHzT9+cE2aILcMvmmmZ09QxIYLNg2thsweP8Rfva/BKsKhYf9pQpyzJH1?= =?us-ascii?Q?vitTWqd7ioDuLjHWdEds+AO8SyuGKvhojSd8QQj/IVYdffphqgsR5ii55Vph?= =?us-ascii?Q?a5blLdJnNBcpECcs1jvTPD8JCShcIL/R6r3aQiQyaTlwJfowZAG5f3mUWioa?= =?us-ascii?Q?S1ImRSEdeu5RSAFRVmtjfbQGPlZBhoENnJ4Evhg4w/RbFEzDC0JcpXm8yLsq?= =?us-ascii?Q?vv1P96dh4BDwuA0MEmsEpmt7ekkNFt6Mc9Ugvo/A2cugu3+c3G8jsmTJPpPW?= =?us-ascii?Q?UQ857TuBpCW7Qs0RpXLl0gKedmmt75p0aOuOXw2Xz0sIzuPQp5zdEJhCjLrt?= =?us-ascii?Q?a61aBj17g4yPM7ECE/t9P4jdaZut0Y1Y4IIukLOhQy0ohlU4W5GrYO68V6Xu?= =?us-ascii?Q?lITt57rWPYNtd3prodI11e0imL6oUrrtBaRkScXyTa3KNpLjoOm/3/33DASY?= =?us-ascii?Q?EDYVMn0jtq99bZ0JTd3FlilAErCuXNvL0ELSjWneJ9Awl09A9FbDMYb8iMXR?= =?us-ascii?Q?FTNn1pi6188YivfJhuUtdYMXco86aAjFFKWL1uXzyW5iBt1dD4uzNLS671uV?= =?us-ascii?Q?3UT0G1IGHZkZvASt2XntCnw?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0921; 5:jm0kXf+Ezd6/wZR/2DxVkvxW4+ebbeO4MjIY4ehDyTjhg6xF0ndb/2bjSlu7AyUrec/D2lM7WTHtWawDqLbjldYthuHl2uRnA04bOABfet4Xo35CtrANWDnkM42MHTn2t4UbGe0cgyNc47hhuonK1A==; 24:vlk+ju7wB///0gHhJxLiZK+N0JQ50Fvwe3u3/3I1cowNhnpEilbys4epfZ14OGB9Mc2hXYoxFGK2E1CpuJq5frZtDfPhMNfCPURhk957swk=; 20:cZ/Fv2cTCOOUO/37xWE7wFRmzqTg3mZ/FkU1lSs5rZSknW6rBAVi3PPtrXY0FPfrcVbSZjvYtJepMIF2rsAacxxgxuO0aIEAUUxcLaZgTcH1OL+/2b9ZrUorsAgDBnd/nSycDrPYL5vIbyBzTVOmv5ulcqNQ8JM2/fuRKI4Ne4M= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2016 09:16:11.1355 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0921 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In near the future, since usbhsf_dma_{un}map() will use the "fifo" data, this patch changes function call orfer in usbhsf_dma_prepare_push(). Signed-off-by: Yoshihiro Shimoda --- drivers/usb/renesas_usbhs/fifo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index b4de70e..eb19dc7 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -880,12 +880,12 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done) if (!fifo) goto usbhsf_pio_prepare_push; - if (usbhsf_dma_map(pkt) < 0) - goto usbhsf_pio_prepare_push; - ret = usbhsf_fifo_select(pipe, fifo, 0); if (ret < 0) - goto usbhsf_pio_prepare_push_unmap; + goto usbhsf_pio_prepare_push; + + if (usbhsf_dma_map(pkt) < 0) + goto usbhsf_pio_prepare_push_unselect; pkt->trans = len; @@ -894,8 +894,8 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done) return 0; -usbhsf_pio_prepare_push_unmap: - usbhsf_dma_unmap(pkt); +usbhsf_pio_prepare_push_unselect: + usbhsf_fifo_unselect(pipe, fifo); usbhsf_pio_prepare_push: /* * change handler to PIO