From patchwork Mon Apr 18 19:21:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 716331 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3IJLjlp019608 for ; Mon, 18 Apr 2011 19:21:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756541Ab1DRTVo (ORCPT ); Mon, 18 Apr 2011 15:21:44 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:61034 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756523Ab1DRTVo (ORCPT ); Mon, 18 Apr 2011 15:21:44 -0400 Received: by ewy4 with SMTP id 4so1481820ewy.19 for ; Mon, 18 Apr 2011 12:21:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=4P2OtpWT53mnTNM33cQdspO2+KPi8+OTnp8GHj/0g2s=; b=mAZhnLnYsRylmdK04f9v0etcnAJnGmG/otDqiHcinRSc3EuoyRI7c7XFV5CYkBAmGo 7EUAIPrQJSPo9w82Kk22+j2caMqE9o/x4ojxdA8qUpOxozwifStoTzEgrlcT9o0Os6SC 5a6tucP2ZCVcza59RllDYsgD6N08PYSyOUJU4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=SxNxd8mmuY7SzHnH8DWHW6He4Wg/zxjVuAro4sZKlmJORr3dZeKVjBuDkgknCCcv3k fs7pbcSrCWNnq3ljQP9qKuAN2B0jQXFxA5/QbtgMrEuYNEvb8G9LBqW6Gr0DpRj2KEzx ra1GlaFa5+i8FBC8S/k+c9gUYV35GWsYdeQio= Received: by 10.213.33.140 with SMTP id h12mr4095957ebd.146.1303154502715; Mon, 18 Apr 2011 12:21:42 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id q53sm4297138eeh.11.2011.04.18.12.21.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Apr 2011 12:21:41 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Felipe Balbi , Jarkko Nikula Subject: [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Date: Mon, 18 Apr 2011 22:21:30 +0300 Message-Id: <1303154492-13520-1-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 19:21:45 +0000 (UTC) Use DEFINE_SPINLOCK() for static spinlock initialization as the commit d04fa5a "locking: Remove deprecated lock initializers" removes the deprecated SPIN_LOCK_UNLOCKED. Since tahvo_lock is not used elsewhere than tahvo.c it can be removed from tahvo.h too. Signed-off-by: Jarkko Nikula --- drivers/cbus/tahvo.c | 2 +- drivers/cbus/tahvo.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c index 8e2e669..45318d9 100644 --- a/drivers/cbus/tahvo.c +++ b/drivers/cbus/tahvo.c @@ -53,7 +53,7 @@ static int tahvo_initialized; static int tahvo_is_betty; static struct tasklet_struct tahvo_tasklet; -spinlock_t tahvo_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(tahvo_lock); struct tahvo_irq_handler_desc { int (*func)(unsigned long); diff --git a/drivers/cbus/tahvo.h b/drivers/cbus/tahvo.h index 6cb6600..e5ed990 100644 --- a/drivers/cbus/tahvo.h +++ b/drivers/cbus/tahvo.h @@ -63,6 +63,4 @@ int tahvo_get_backlight_level(void); int tahvo_get_max_backlight_level(void); void tahvo_set_backlight_level(int level); -extern spinlock_t tahvo_lock; - #endif /* __DRIVERS_CBUS_TAHVO_H */