From patchwork Wed Aug 8 21:27:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10607 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E749223F00 for ; Wed, 8 Aug 2012 21:28:22 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id B63C0A1891B for ; Wed, 8 Aug 2012 21:28:22 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so1326862yhp.11 for ; Wed, 08 Aug 2012 14:28:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=a52EEcIrrU/vCH4LrssSlahuNwM4Nhz/mVEmsdG5xHw=; b=aIP8fqHuLQfGS0QWprjCLaetN2RlmW6yRHHwyTYML1HgXROsH/l7PSSWJx/WzVoBpW NNu7cdfTrbuhgYW1rupevpdrit37gSAH3wG5oDVfgBdkJkQ80I0ns83PMwQdQPFdiU0S GuLCDxMouHqUwAF5fvkIXk1C6EJlj5WvdvskLlonCcI3ZbRBvohypZN1XeCmngl4bgw2 15sC/1MpO0d+1OsVcLiwYUXsrfoPH0FUqTxCeGBi6E0rhAQbYwa0givGEYo/JYGW5I4Z W+pO4Z8UwksGsECCIMYW0fgtzIOmD3WOysy3lP8UeNlJ/maSV4RVZaidaN01GfYi6i8k 4KdA== Received: by 10.50.159.135 with SMTP id xc7mr379171igb.9.1344461302319; Wed, 08 Aug 2012 14:28:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp628849igc; Wed, 8 Aug 2012 14:28:21 -0700 (PDT) Received: by 10.180.105.130 with SMTP id gm2mr972818wib.6.1344461300739; Wed, 08 Aug 2012 14:28:20 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTP id dh6si9287839wib.34.2012.08.08.14.28.20; Wed, 08 Aug 2012 14:28:20 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lj72Q-1Tb1r50Iww-00dTYB; Wed, 08 Aug 2012 23:28:09 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Thomas Gleixner , Russell King Subject: [PATCH 01/10] ARM: footbridge: nw_gpio_lock is raw_spin_lock Date: Wed, 8 Aug 2012 23:27:49 +0200 Message-Id: <1344461278-28245-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344461278-28245-1-git-send-email-arnd@arndb.de> References: <1344461278-28245-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:4x1N39nDtNpEnzAXKwhzKuMxaTMCq4nb9FbpZ7+nH6/ jcwKAknND1m+q69fyLMli78NmJ108vuS6MiKg5Dw7rlllEux9h 8Ar7PdAcsWCcnuHSgUsXi/TVj4tBLkJIejP8vS7JgY3WCeXomW JzqVH5GgJ1Xj+Z6opo7WJgdzTSMnwAvLQZvlZX5mf+p36ANDa0 BOyJzZPbEPnhFkUju2GQNuOboMffkIHPf+m52knH3pWmvAAn3P zenLHpSt82jdf+ZKYryR837Pg7b8vmX29Hj2uQA6Y04OmsA0uD Nd8sHP1DL1+8PRDHBRLZwegCVqvYE3npVNmH77Ot4FPzDucghh elYTCndsiB8GK5JrSlI0kE94suwRxd96+VVpAfzo5Io4Khdkhq ytjXKrRUtx21w== X-Gm-Message-State: ALoCoQmTWNCVU5LxmeVeL10wLJK0N3bSsMRB7xCVDVuDP80bNw1zXexdDZLSh3z5jGPoUcHe53Um bd31b85960a "locking, ARM: Annotate low level hw locks as raw" made nw_gpio_lock a raw spinlock, but did not change all the users in device drivers. This fixes the remaining ones. sound/oss/waveartist.c: In function 'vnc_mute_spkr': sound/oss/waveartist.c:1485:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default] include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *' drivers/char/ds1620.c: In function 'netwinder_lock': drivers/char/ds1620.c:77:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default] include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *' drivers/char/nwflash.c: In function 'kick_open': drivers/char/nwflash.c:620:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default] include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *' Signed-off-by: Arnd Bergmann Cc: Thomas Gleixner Cc: Russell King --- drivers/char/ds1620.c | 8 ++++---- drivers/char/nwflash.c | 4 ++-- sound/oss/waveartist.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index aab9605..24ffd8c 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c @@ -74,21 +74,21 @@ static inline void netwinder_ds1620_reset(void) static inline void netwinder_lock(unsigned long *flags) { - spin_lock_irqsave(&nw_gpio_lock, *flags); + raw_spin_lock_irqsave(&nw_gpio_lock, *flags); } static inline void netwinder_unlock(unsigned long *flags) { - spin_unlock_irqrestore(&nw_gpio_lock, *flags); + raw_spin_unlock_irqrestore(&nw_gpio_lock, *flags); } static inline void netwinder_set_fan(int i) { unsigned long flags; - spin_lock_irqsave(&nw_gpio_lock, flags); + raw_spin_lock_irqsave(&nw_gpio_lock, flags); nw_gpio_modify_op(GPIO_FAN, i ? GPIO_FAN : 0); - spin_unlock_irqrestore(&nw_gpio_lock, flags); + raw_spin_unlock_irqrestore(&nw_gpio_lock, flags); } static inline int netwinder_get_fan(void) diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index d45c334..04e2a94 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c @@ -617,9 +617,9 @@ static void kick_open(void) * we want to write a bit pattern XXX1 to Xilinx to enable * the write gate, which will be open for about the next 2ms. */ - spin_lock_irqsave(&nw_gpio_lock, flags); + raw_spin_lock_irqsave(&nw_gpio_lock, flags); nw_cpld_modify(CPLD_FLASH_WR_ENABLE, CPLD_FLASH_WR_ENABLE); - spin_unlock_irqrestore(&nw_gpio_lock, flags); + raw_spin_unlock_irqrestore(&nw_gpio_lock, flags); /* * let the ISA bus to catch on... diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index 24c430f..672af8b 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -1482,9 +1482,9 @@ vnc_mute_spkr(wavnc_info *devc) { unsigned long flags; - spin_lock_irqsave(&nw_gpio_lock, flags); + raw_spin_lock_irqsave(&nw_gpio_lock, flags); nw_cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE); - spin_unlock_irqrestore(&nw_gpio_lock, flags); + raw_spin_unlock_irqrestore(&nw_gpio_lock, flags); } static void