From patchwork Wed Jan 7 11:28:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 42810 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C03D32055F for ; Wed, 7 Jan 2015 11:29:28 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id ex7sf685902wid.3 for ; Wed, 07 Jan 2015 03:29:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Nbnx0Zw/i6TcnjdqThwCQk7c6h5eYsxoefa6Hifc/CE=; b=Svo/LNpBX9cFl5l7BFodljQJvK5NFW0dku6A0tU/MCFxHjk/zQyE0LWFa0OIWCIjYu RKzqs2xQJetibD0VcrkMnR/WMKVc8dl78Lm/0jdE9PEf5eagOUjhk/QQ3pfozkWet+4Z et6xDWZzaJQ/OA6hHRy7M2yL42L+EL8DJzxNJG57nWWeu3zyg6Q3XLW9a9AKxtcfQdRr DvjkJ1+1awmSBj9vFT5lUH4wtAq6OzjVbh/BO8j52zP7piHSXWV/pEZ/185CdXHg/QnQ 571klfqmZXw8GGwCSXV+R8pfePAIWjZaBgyWgOpOZotwx7i5QPmtCLGaBX49a1rmnR28 2NNg== X-Gm-Message-State: ALoCoQn+CdFwna3x1JfJtXNn+EkszqRBIGhujs5qrnDEACttwWpRvdYod0KrpPip9vyGvLDcDhcX X-Received: by 10.112.118.18 with SMTP id ki18mr140045lbb.15.1420630168010; Wed, 07 Jan 2015 03:29:28 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.170 with SMTP id p10ls162199lal.35.gmail; Wed, 07 Jan 2015 03:29:27 -0800 (PST) X-Received: by 10.152.6.67 with SMTP id y3mr3512033lay.90.1420630167803; Wed, 07 Jan 2015 03:29:27 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ac4si2111162lbc.111.2015.01.07.03.29.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Jan 2015 03:29:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id gq15so2842846lab.4 for ; Wed, 07 Jan 2015 03:29:27 -0800 (PST) X-Received: by 10.152.197.5 with SMTP id iq5mr3577744lac.6.1420630167660; Wed, 07 Jan 2015 03:29:27 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1450165lbb; Wed, 7 Jan 2015 03:29:26 -0800 (PST) X-Received: by 10.70.90.209 with SMTP id by17mr4490398pdb.162.1420630165758; Wed, 07 Jan 2015 03:29:25 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bu11si2528569pdb.95.2015.01.07.03.29.24; Wed, 07 Jan 2015 03:29:25 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752601AbbAGL3G (ORCPT + 27 others); Wed, 7 Jan 2015 06:29:06 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:63043 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbbAGL3E (ORCPT ); Wed, 7 Jan 2015 06:29:04 -0500 Received: by mail-wi0-f179.google.com with SMTP id ex7so1383658wid.6 for ; Wed, 07 Jan 2015 03:29:03 -0800 (PST) X-Received: by 10.180.88.33 with SMTP id bd1mr46690965wib.10.1420630142976; Wed, 07 Jan 2015 03:29:02 -0800 (PST) Received: from localhost.localdomain (AToulouse-656-1-966-184.w90-50.abo.wanadoo.fr. [90.50.223.184]) by mx.google.com with ESMTPSA id u18sm1749550wjq.42.2015.01.07.03.29.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jan 2015 03:29:02 -0800 (PST) From: Daniel Lezcano To: tglx@linutronix.de Cc: olof@lixom.net, magnus.damm@gmail.com, tjakobi@math.uni-bielefeld.de, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] clocksource: kona: fix __iomem annotation Date: Wed, 7 Jan 2015 12:28:57 +0100 Message-Id: <1420630138-31443-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420630138-31443-1-git-send-email-daniel.lezcano@linaro.org> References: <54AD17F1.4010002@linaro.org> <1420630138-31443-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Olof Johansson It makes no sense to hide the __iomem annotation from the function that uses it, especially since it causes a sparse warning: drivers/clocksource/bcm_kona_timer.c:118:38: warning: incorrect type in argument 1 (different address spaces) drivers/clocksource/bcm_kona_timer.c:118:38: expected void *timer_base drivers/clocksource/bcm_kona_timer.c:118:38: got void [noderef] *static [toplevel] tmr_regs Signed-off-by: Olof Johansson Acked-by: Florian Fainelli Signed-off-by: Daniel Lezcano --- drivers/clocksource/bcm_kona_timer.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index 0595dc6..f1e33d0 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c @@ -68,9 +68,8 @@ static void kona_timer_disable_and_clear(void __iomem *base) } static void -kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw) +kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw) { - void __iomem *base = IOMEM(timer_base); int loop_limit = 4; /* @@ -86,9 +85,9 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw) */ while (--loop_limit) { - *msw = readl(base + KONA_GPTIMER_STCHI_OFFSET); - *lsw = readl(base + KONA_GPTIMER_STCLO_OFFSET); - if (*msw == readl(base + KONA_GPTIMER_STCHI_OFFSET)) + *msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET); + *lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET); + if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET)) break; } if (!loop_limit) {