From patchwork Thu Apr 3 23:34:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RGF2aWQgSMODwqRyZGVtYW4=?= X-Patchwork-Id: 3935071 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 809F89F369 for ; Thu, 3 Apr 2014 23:34:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF4FB20320 for ; Thu, 3 Apr 2014 23:34:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C353F20306 for ; Thu, 3 Apr 2014 23:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754089AbaDCXey (ORCPT ); Thu, 3 Apr 2014 19:34:54 -0400 Received: from hardeman.nu ([95.142.160.32]:40347 "EHLO hardeman.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754081AbaDCXev (ORCPT ); Thu, 3 Apr 2014 19:34:51 -0400 Received: from zeus.hardeman.nu (ppp-188-174-176-74.dynamic.mnet-online.de [188.174.176.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vader.hardeman.nu (Postfix) with ESMTPSA id ED3E4273; Fri, 4 Apr 2014 01:34:49 +0200 (CEST) Received: by zeus.hardeman.nu (Postfix, from userid 1000) id A4196C600FA; Fri, 4 Apr 2014 01:34:48 +0200 (CEST) Subject: [PATCH 42/49] rc-ir-raw: atomic reads of protocols From: David =?utf-8?b?SMOkcmRlbWFu?= To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com Date: Fri, 04 Apr 2014 01:34:48 +0200 Message-ID: <20140403233448.27099.69654.stgit@zeus.muc.hardeman.nu> In-Reply-To: <20140403232420.27099.94872.stgit@zeus.muc.hardeman.nu> References: <20140403232420.27099.94872.stgit@zeus.muc.hardeman.nu> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Use atomic reads to avoid having to take a mutex when getting the bitmask of supported protocols. Signed-off-by: David Härdeman --- drivers/media/rc/rc-core-priv.h | 2 +- drivers/media/rc/rc-ir-raw.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h index c3de26b..04776e8 100644 --- a/drivers/media/rc/rc-core-priv.h +++ b/drivers/media/rc/rc-core-priv.h @@ -29,7 +29,7 @@ enum rc_driver_type { struct ir_raw_handler { struct list_head list; - u64 protocols; /* which are handled by this handler */ + unsigned protocols; /* which are handled by this handler */ int (*decode)(struct rc_dev *dev, struct ir_raw_event event); /* These two should only be used by the lirc decoder */ diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c index 9631825..bf5215b 100644 --- a/drivers/media/rc/rc-ir-raw.c +++ b/drivers/media/rc/rc-ir-raw.c @@ -27,7 +27,7 @@ static LIST_HEAD(ir_raw_client_list); static LIST_HEAD(ir_raw_handler_list); /* protocols supported by the currently loaded decoders */ -static u64 available_protocols; +static atomic_t available_protocols = ATOMIC_INIT(0); static int ir_raw_event_thread(void *data) { @@ -251,11 +251,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_handle); /* used internally by the sysfs interface */ static u64 ir_raw_get_allowed_protocols(struct rc_dev *dev) { - u64 protocols; - mutex_lock(&ir_raw_mutex); - protocols = available_protocols; - mutex_unlock(&ir_raw_mutex); - return protocols; + return atomic_read(&available_protocols); } static int change_protocol(struct rc_dev *dev, u64 *rc_type) { @@ -353,7 +349,7 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler) if (ir_raw_handler->raw_register) list_for_each_entry_rcu(raw, &ir_raw_client_list, list) ir_raw_handler->raw_register(raw->dev); - available_protocols |= ir_raw_handler->protocols; + atomic_set_mask(ir_raw_handler->protocols, &available_protocols); mutex_unlock(&ir_raw_mutex); synchronize_rcu(); @@ -370,7 +366,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) if (ir_raw_handler->raw_unregister) list_for_each_entry_rcu(raw, &ir_raw_client_list, list) ir_raw_handler->raw_unregister(raw->dev); - available_protocols &= ~ir_raw_handler->protocols; + atomic_clear_mask(ir_raw_handler->protocols, &available_protocols); mutex_unlock(&ir_raw_mutex); synchronize_rcu(); }