From patchwork Tue Sep 9 16:10:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 4871581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 861419F3EC for ; Tue, 9 Sep 2014 16:13:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D5BF20170 for ; Tue, 9 Sep 2014 16:13:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E6BD2015D for ; Tue, 9 Sep 2014 16:13:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRO0b-0004c3-Rq; Tue, 09 Sep 2014 16:11:09 +0000 Received: from mailout1.w2.samsung.com ([211.189.100.11] helo=usmailout1.samsung.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRO0Z-0004OC-0K for linux-arm-kernel@lists.infradead.org; Tue, 09 Sep 2014 16:11:07 +0000 Received: from uscpsbgm2.samsung.com (u115.gpu85.samsung.co.kr [203.254.195.115]) by mailout1.w2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NBN00FEW69VF420@mailout1.w2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 09 Sep 2014 12:10:43 -0400 (EDT) X-AuditID: cbfec373-b7f9d6d00000479f-f5-540f26838460 Received: from ussync3.samsung.com ( [203.254.195.83]) by uscpsbgm2.samsung.com (USCPMTA) with SMTP id 7C.DF.18335.3862F045; Tue, 09 Sep 2014 12:10:43 -0400 (EDT) Received: from recife.lan ([105.144.134.251]) by ussync3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NBN009FM69P8E60@ussync3.samsung.com>; Tue, 09 Sep 2014 12:10:43 -0400 (EDT) Date: Tue, 09 Sep 2014 13:10:36 -0300 From: Mauro Carvalho Chehab To: Sylwester Nawrocki Subject: [PATCHv2 2/3] [media] s5p-jpeg: Fix compilation with COMPILE_TEST Message-id: <20140909131036.7265121f.m.chehab@samsung.com> In-reply-to: <540F1D11.9030400@samsung.com> References: <20140909124306.2d5a0d76@canb.auug.org.au> <6cbd00c5f2d342b573aaf9c0e533778374dd2e1e.1410273306.git.m.chehab@samsung.com> <540F15B2.3000902@samsung.com> <20140909120936.527bd852.m.chehab@samsung.com> <540F1D11.9030400@samsung.com> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.22; x86_64-redhat-linux-gnu) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/hYN1mNf4Qg6/LDCx6rz5ntPjx+gKb Re+Cq2wWZ5vesFtsenyN1eLyrjlsFj0btrJaHFzYxmgx4/w+JosdpxYxWxx+085qsXXvVXYH Ho/GGzfYPDav0PLYvKTeo2/LKkaPz5vkAlijuGxSUnMyy1KL9O0SuDL6N6xjK3jDXnHzzC+2 Bsa3bF2MHBwSAiYSv79qdjFyApliEhfurQcKc3EICSxhlOg4/p4Rwmlmkvi5/y4rSBWLgKrE 911fmEFsNgEjiVeNLWBxEQF9iSWrLoJ1MwscYZa4cmUbG0hCWMBL4vuLs+wg23gFrCRWz/EC MTkFtCXOLleHmH+SSWLPxXuMEFc4S/ycOQnM5hUQlPgx+R4LiM0soCWxeVsTK4QtL7F5zVvm CYwCs5CUzUJSNgtJ2QJG5lWMoqXFyQXFSem5RnrFibnFpXnpesn5uZsYITFRvIPxxQarQ4wC HIxKPLwnYvhChFgTy4orcw8xSnAwK4nwWr8ACvGmJFZWpRblxxeV5qQWH2Jk4uCUamCcxZfc tczqT8urzyL8B7v5/FflthpePjUnsWT/Uv8j3xrf9hvNZ59w3uk286kgpeYrvufjBNIUWZco 5nAeUQhImLEramdIyKGi4lrV1KQPzRXuDAc979zZUblV8dKrdKULNnN5WpfXdl9uveT4z1V0 xuYv3rLTr92f8ryZpVX9yPWsdw9WJqsosRRnJBpqMRcVJwIATrx2XGcCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140909_091107_147924_5765C50F X-CRM114-Status: UNSURE ( 6.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.5 (-------) Cc: Stephen Rothwell , Kamil Debski , Kukjin Kim , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Kyungmin Park , linux-samsung-soc@vger.kernel.org, linux-next@vger.kernel.org, Jacek Anaszewski , linux-arm-kernel@lists.infradead.org, Linux Media Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 ERROR: "__bad_ndelay" [drivers/media/platform/s5p-jpeg/s5p-jpeg.ko] undefined! That happens because asm-generic doesn't like any ndelay time bigger than 20us. Currently, usleep_range() couldn't simply be used, since exynos4_jpeg_sw_reset() is called with a spinlock held. So, let's use ndelay() instead. Reported-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab Acked-by: Sylwester Nawrocki diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c index e51c078360f5..ab6d6f43c96f 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c @@ -23,7 +23,7 @@ void exynos4_jpeg_sw_reset(void __iomem *base) reg = readl(base + EXYNOS4_JPEG_CNTL_REG); writel(reg & ~EXYNOS4_SOFT_RESET_HI, base + EXYNOS4_JPEG_CNTL_REG); - ndelay(100000); + udelay(100); writel(reg | EXYNOS4_SOFT_RESET_HI, base + EXYNOS4_JPEG_CNTL_REG); }