From patchwork Mon Apr 18 07:53:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 8868531 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 CF0D99F443 for ; Mon, 18 Apr 2016 07:54:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B77920035 for ; Mon, 18 Apr 2016 07:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E40EE2026D for ; Mon, 18 Apr 2016 07:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045AbcDRHyP (ORCPT ); Mon, 18 Apr 2016 03:54:15 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:6958 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752041AbcDRHyN (ORCPT ); Mon, 18 Apr 2016 03:54:13 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 18 Apr 2016 16:54:11 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 6611650378; Mon, 18 Apr 2016 16:54:11 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 4A1228002E; Mon, 18 Apr 2016 16:54:11 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 454668002D; Mon, 18 Apr 2016 16:54:11 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id SAB10527; Mon, 18 Apr 2016 16:54:11 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="209568567" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 18 Apr 2016 16:54:10 +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=d55PwmxcMJszqZ9glznHE0hykuL/5brt8evW/ATqUbY=; b=ZELUhQlEBD9n79ORFNvhj97vbhHo7RvW+GCKp2l5T4Gg/9O7wMbzlJhm19LD0IzFv/hMxQeybO7VPttl+aLv+VAuRX6Oa/rJIyW/NJnrJSPqGWwh2RMqWDrQESkPqMTK+AZZRa9J0XAG03CV3mLGldL2opZHuJViaCzQJhNAVGg= 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.141) by SG2PR06MB0919.apcprd06.prod.outlook.com (10.162.204.152) with Microsoft SMTP Server (TLS) id 15.1.453.26; Mon, 18 Apr 2016 07:54:08 +0000 From: Yoshihiro Shimoda To: CC: , , , Yoshihiro Shimoda Subject: [PATCH 3/5] usb: renesas_usbhs: change function call orfer in usbhsf_dma_prepare_push() Date: Mon, 18 Apr 2016 16:53:40 +0900 Message-ID: <1460966022-3444-4-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1460966022-3444-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1460966022-3444-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.141] X-ClientProxiedBy: OS2PR01CA0042.jpnprd01.prod.outlook.com (10.164.161.152) To SG2PR06MB0919.apcprd06.prod.outlook.com (10.162.204.152) X-MS-Office365-Filtering-Correlation-Id: e899d400-66d0-4a66-ab78-08d3675e9f97 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0919; 2:Uwnd5pQdLR2LWywl1wYRzAKFXDU8/xOSDWFDowVf5Yft6RdX8n8uA8XQ7yCbKTTA6phzvFepBqjLZJQGb4ZSjdy5egqTFgkVOAxYtQHH0Q5qqxub7z+SyAWqYlwLuFI/Lb8ZTTrlrvULnLLLEyZvY7xrZfOdSiMyNMwSZ5+jAoKji8GFVjhzPtYzlPTENgA7; 3:4zSzvoqn33iV0rYfbbSkmuHy5Gu5tCjjgg9Qda8708U1N9lA5jZ5ccs/M3m1BV/8pP3Kv2zT9RbHFS+wE01BZgqEiWbxraM8mOoqkhCY10VZTJt5+AKbSx8M7L7h24cV X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0919; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0919; 25:gY/UJidrSMnuoqn0HxUmaZaV8r7OlTVoNPqP4mwnQ5bHWSFaUVaYSAknlIYYzk9S4GE/+HUE8jggiH17fC5t2//S39VM/7ahv5j1lwWos1h3poSUooNgVGlA0VM2HAzv6RyPQr9p/Rl5ewhShUcVELsgfzZZGCfv3Ou4EWoXCzQ51GxVHkd2XRPTZJIRhv+NpapEySzPJE3xsxgCnmH0ea/w2zkG5EgwmNRmXO5NsgtfEtTz7nhS2ubHB2T/skCzXbrAmmQoInRCYl/Rg1eNMSpRWLLndVgdb6u7eMugSc6rF+ouZsRuojZaW+ivvDzrd5QL7aw6ARPNyY7hwh1zgF5oMnYEVZWQ6Nk9BXyCXexmL4tATfc3LtWvtcc2l5pMAeXp64NSFke4mV32EIEpaoRRLcv2NRCEpZ4SxPDpQdtc7oQsYyEIsWI72wTiw6LgAvGKf9lGxSfVE5BBrFATC1DCrTOIDMFx7dIgRoKMfIULz2T7APsryq9xID6lz0XV7woqBo5ABCcgGL180jAtf88ZEm1VA/3Ld7mWgABxkUPNZhzREV8FXacC6jeJfumKhNzFbKruvsDBPkqqga2FELKvS1I2jR8faeW0cWgqlSZx7o563Hjl9+RWJdKZ66jYpxqu98LWfaikQBGuWRNOk+aeVjrHX4+5CBPlI8oHGjSqmtOWW1dubY4G1M5DNq+Ky6lVdhcHXbmIc7dzbCqlng== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0919; 20:pTYHpskOkBCfXc1OKcOCInn1zOtqRKfMlIq5FqW2StvDLpl/tRu/LLzVLqETWev1y5AitB5dySzKGvP4itMxcsenCLQzDeIpY9uc88OJZfThcPcYeqak/y6XZ9XG2sF1mf1v7TFQrlWJsta1QRC6kIU3iN65j6vHG/ehvlmkTlTnInPrRQdrt0tJoFRTuc3c2cRtAoAw4od7fA7885fuTer749IKrz5zJaydsgYkT2iTYtZrALocqbqvGY17KfE+hsPZcxuNoDWuR2TjZUEUSc3j5yDPvX7xlYLcjCzsXXz+t1eGdz//D7vJE3O0UT1EGiVraIH4y9RhvPY9o90GM53c4bEeaqjGxtM5dGNh3G2WcpE/f+y6GHes+UHEkfrsBBjp1o53gWKC6wIwCzbLYRjumiKGnaNz+WakIepLwOL6diE/KXJWXHYQSQURlGT/+R+1rB6ltb4kW8hPnWNqM17XVWcnP7vOtG6KALbFyXWd73zpFmRBSZYvHc3M17F7; 4:UEhn9omptK3JHglHxhUXQ+djuICOoHHQLECSHIIFifuRMk5Qzu4NdGLvwI11indbWZ6agWfYgrMX5BD7hMbKLyhsBxj0EiA0oUQKHXdOgaYl8xab3gZUiB9fxY4O4E4rj9La+HxsZ91CpSpMNH5N9A60BUmgocbSLfXieONuc8Qdzf85RETGF8AkgULimjwDXSKPt2wgQYCumkEz8GZXPKu1ino6xvKj06GWwcvaQBct2n+RBKsBDmzuEzxYda4+hF919/NCuHDblMbOBSG2oOJ2wmin2DhiuDLkPoKTOz/zyOEkdvRQWLfTgLsiV7Y4umsrZn56/zeSMp585wc6Utig1xuxRKcIBIlk5Pe7hT1yQ3QxmgGz64EPd/sbEZnLjEeWmGPLy2lbqpziZ2p1uA== 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)(10201501046)(3002001)(6055026); SRVR:SG2PR06MB0919; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0919; X-Forefront-PRVS: 0916FC3A18 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(6009001)(19580405001)(33646002)(229853001)(5008740100001)(19580395003)(50986999)(76176999)(36756003)(1096002)(76506005)(586003)(78352003)(6116002)(2906002)(3846002)(4326007)(2351001)(5004730100002)(42382002)(50226001)(50466002)(5003940100001)(81166005)(2950100001)(4001430100002)(77096005)(189998001)(107886002)(48376002)(92566002)(42186005)(47776003)(66066001)(110136002); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0919; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0919; 23:xol4x6X7fMcdJC++qrJxqQbI7OQRB6BDyO+hH4jaI?= =?us-ascii?Q?5NmCCfOjIEmHRU80GH/3cmhYwg+EZnNC1Zpx5aHgWrSu8n/zwjR75ak9H2H8?= =?us-ascii?Q?fSB3sMU+TAbZdhbWW09wy0hP8OL9ICSScEPkmXR5y7aI3lLX6/VQslirkfcw?= =?us-ascii?Q?8jEx5wM8VN+iNb3+mu/t/ClT4Zo3BvddrVVCB7JEFXWh88h6hyaDj+2Kclfe?= =?us-ascii?Q?iDcb1yoX9txs5LHevcUBMJW27ZFR/tT90tJYXDpf9RXjvbKmg6IrxDkQ21cE?= =?us-ascii?Q?MQTLb4cymOiH6vtTDt6TwH0E0uJXGrSkoWJMZjHPIIZv0F/Hzh+55rSW8usd?= =?us-ascii?Q?6Ws146DvY/S6SWKX6jRdHzHcg2CMfR/sppKsj3IpD+DjklJ4eNLbbep6Ii2r?= =?us-ascii?Q?fuLtLymp+fffnk9hgVYZT0PypvyLzvhsotDfxw6tvtS80SVCE9B+F3hl8ERK?= =?us-ascii?Q?vVUxjrmXfIgzWmcPlzhnZ9+bEXEfxKaXVGE9gTeY5s6LhtV11fHj0DqRZcT/?= =?us-ascii?Q?6tGig0sT7cIs66pk87yUoXm/4M/H0BBptY9nS9Yk67NZVeGNLsaXpnAcYcJ+?= =?us-ascii?Q?u3Cmz4nfMq4QtkYodQ8nNadig14WNur54LAdjmyTI9Wsc/KEgCN8+Vg9UTs3?= =?us-ascii?Q?D1hXUjDPw3KMpCFy5Byskuc/K7TXL5KaZIxDhPpa5vDsE3BYvkLgDFxIpt38?= =?us-ascii?Q?UZ2kyIRIXrPVn3RwnO6q8rQmHZm4yolOHCYLQ3idyCY8+zJ0zrU3+Ah47uS2?= =?us-ascii?Q?QoYDC8EtoIwYV6r0bhdYghbJUy1lTKsODprkhz0wYpkAsB7dn6/vPrRVwtYV?= =?us-ascii?Q?twJs6eQ4XD8YdCgmEBAxyxnm0rwOCIl/JQKgMRd/5Igw5iNH8Q8GEtZx77EA?= =?us-ascii?Q?L0gzhX+JLHGPOgYIQnGaNV3gRDFLZ+3C1Sy1flANqs3ytFnkQREfWEEYzAiq?= =?us-ascii?Q?yIKWefNCKojCw5afw1LmqTdxxeYhooEdRvxK7XgFg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0919; 5:mET++JrTa3B/sYzCR0fcjDBsRtniGtGzk6eC+alDHYl6VCiIHfGqMiPfbeIsNlQ1aP3juckxA1v2cJCjE1FQFscBd9j8BK9OgHAkPLHC5RcaH148k4EClVBteM5BO2mCbUOo979S6cm2TYuUZKjnAQ==; 24:jhh+ItJL7kvxq1h3WZLYylM0FKe8XSRXDeVTcm0INpJT4YlKz9s18cMn3ucU3DCwR7fZcQl7/ubrzpG5e/oPhzxdgueYdfELyw6HKa2rXng=; 20:KSSPRCKaFyHHJGU+LotauvyHUMIufROhHpK/oeoKAnAW3BoEO9nsIZPB1N9CBxw/yNVktbILGLfHMrXxgqOFz+mwOjsuXgS4tjeyPaFpEkAQ94ahQaOq4F2g4d/kt8oPwDOcS6v8cJeJ/DRPURW8Ufqy7BjqMTJ6XNZiTQKLJRE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2016 07:54:08.9600 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0919 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 Since usbhsf_dma_{un}map() will use the "fifo" data in the near future, 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 000f975..a805b23 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -881,12 +881,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; @@ -896,8 +896,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