From patchwork Wed Oct 23 09:54:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 3087571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DB02DBF924 for ; Wed, 23 Oct 2013 10:01:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC8F62029B for ; Wed, 23 Oct 2013 10:01:43 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 003C8201DC for ; Wed, 23 Oct 2013 10:01:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYvFr-0004Zb-HC; Wed, 23 Oct 2013 10:01:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYvFp-00026V-49; Wed, 23 Oct 2013 10:01:29 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYvFm-00026A-IK for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2013 10:01:27 +0000 Received: by mail-pa0-f44.google.com with SMTP id fb1so749768pad.3 for ; Wed, 23 Oct 2013 03:01:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=C+bdx1byeAN96MeQeddxxpiRgSa0zhWiHwxawxNPU4M=; b=R5qgW5NZwSKzq9zzKs08JO3QzeWYfzYjS6APgVEMeRh5/H88u1AVCIxh6rUORj3phC V3rbfj0eQkZvyTSsfC8sUCN75uan9Pa2iT3fBRkxi9dFk9Bc7W1QXYoMWvI/R2H8Mq+v MPtiZJ2WeXEl5ksrHmSwi/VO4DjAmmGEOrf8H0wzK/BTgSmFaGmf/jJBNPydaHQyEE7y gAYxLmmssctdGH879JCOkTL+yAinO3RRYqBiTdSttuyoW70QR9phKop4dEuVK9PE1TwP 4D1sSAuZtYP1jDbReJXJsgkbCEStJMnFkeyQbiggNMlZgdoHegh6Fl5P04xKWf60n+bq xBvA== X-Gm-Message-State: ALoCoQlgLRpqEWtmiAOaXOVqnsO/SNo9z6lHIj3AxwWGGxM4vC+BoKlegL6cEbnrua5C36WBpS9c X-Received: by 10.68.211.233 with SMTP id nf9mr679715pbc.85.1382522140409; Wed, 23 Oct 2013 02:55:40 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id zq10sm39914789pab.6.2013.10.23.02.55.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Oct 2013 02:55:37 -0700 (PDT) From: Tushar Behera To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: bL_switcher: Remove cpu_hotplug_driver_{lock, unlock}() Date: Wed, 23 Oct 2013 15:24:33 +0530 Message-Id: <1382522073-14995-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131023_060126_678206_3E1A61E7 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: dave.martin@linaro.org, patches@linaro.org, linux@arm.linux.org.uk, nico@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Commit 6dedcca610c6 ("hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock())" removes the the definition of cpu_hotplug_driver_{lock,unlock} APIs, thereby causing a build error. Replace these calls with {lock,unlock}_device_hotplug(). Signed-off-by: Tushar Behera Acked-by: Nicolas Pitre --- arch/arm/common/bL_switcher.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 63bbc4f..5774b6e 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -577,9 +577,9 @@ static int bL_switcher_enable(void) int cpu, ret; mutex_lock(&bL_switcher_activation_lock); - cpu_hotplug_driver_lock(); + lock_device_hotplug(); if (bL_switcher_active) { - cpu_hotplug_driver_unlock(); + unlock_device_hotplug(); mutex_unlock(&bL_switcher_activation_lock); return 0; } @@ -615,7 +615,7 @@ error: bL_activation_notify(BL_NOTIFY_POST_DISABLE); out: - cpu_hotplug_driver_unlock(); + unlock_device_hotplug(); mutex_unlock(&bL_switcher_activation_lock); return ret; } @@ -629,7 +629,7 @@ static void bL_switcher_disable(void) struct task_struct *task; mutex_lock(&bL_switcher_activation_lock); - cpu_hotplug_driver_lock(); + lock_device_hotplug(); if (!bL_switcher_active) goto out; @@ -685,7 +685,7 @@ static void bL_switcher_disable(void) bL_activation_notify(BL_NOTIFY_POST_DISABLE); out: - cpu_hotplug_driver_unlock(); + unlock_device_hotplug(); mutex_unlock(&bL_switcher_activation_lock); }