From patchwork Wed Jan 28 21:17:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5737011 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A46FFBF440 for ; Thu, 29 Jan 2015 03:34:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEEE620222 for ; Thu, 29 Jan 2015 03:33:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA891201CE for ; Thu, 29 Jan 2015 03:33:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757225AbbA2BoZ (ORCPT ); Wed, 28 Jan 2015 20:44:25 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:50584 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755159AbbA2BoW (ORCPT ); Wed, 28 Jan 2015 20:44:22 -0500 Received: from wuerfel.lan. ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0MS2e2-1Y66Qw0guo-00TH1u; Wed, 28 Jan 2015 22:17:56 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Hans Verkuil Subject: [PATCH 2/7] [media] radio/aimslab: use mdelay instead of udelay Date: Wed, 28 Jan 2015 22:17:42 +0100 Message-Id: <1422479867-3370921-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1422479867-3370921-1-git-send-email-arnd@arndb.de> References: <1422479867-3370921-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:EQhSBYIlSFIy9k90X5LLM2vkn0tieBkgTCONmJfJVFHP6uY9D5o NpG+PnAwgZwlFuo1WrhkZHpZl8fAxFMMcxbsgpD0Pj/JiB4r0GTXkz0qm5OQ9LAVbMWlXKY ZPUf+X1CkkMkv7cOSXXrQHNQ3KLznPbxrAlEoj367lcx2HDtLaoCr1jacbbCvcwgu2RS9yY 3/t6fVykDw98Eqtp/oNDw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Large udelay values are not allowed on the ARM architecture and result in a build error like ERROR: "__bad_udelay" [drivers/media/radio/radio-aimslab.ko] undefined! This changes the aimslab radio driver to use an equivalent mdelay statement. Signed-off-by: Arnd Bergmann Cc: Hans Verkuil --- drivers/media/radio/radio-aimslab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index a739ad492e7b..ea9308796741 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c @@ -129,11 +129,11 @@ static int rtrack_s_mute_volume(struct radio_isa_card *isa, bool mute, int vol) } else if (curvol < vol) { outb(0x98, isa->io); /* volume up + sigstr + on */ for (; curvol < vol; curvol++) - udelay(3000); + mdelay(3); } else if (curvol > vol) { outb(0x58, isa->io); /* volume down + sigstr + on */ for (; curvol > vol; curvol--) - udelay(3000); + mdelay(3); } outb(0xd8, isa->io); /* volume steady + sigstr + on */ rt->curvol = vol;