From patchwork Sat Dec 20 22:34:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5523371 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 B3AC49F4DC for ; Sat, 20 Dec 2014 22:35:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC39F20165 for ; Sat, 20 Dec 2014 22:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D447C2017D for ; Sat, 20 Dec 2014 22:35:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752904AbaLTWfb (ORCPT ); Sat, 20 Dec 2014 17:35:31 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:46850 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720AbaLTWfa (ORCPT ); Sat, 20 Dec 2014 17:35:30 -0500 Received: from dyn3-82-128-190-202.psoas.suomi.net ([82.128.190.202] helo=localhost.localdomain.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Y2ScS-0008TP-DX; Sun, 21 Dec 2014 00:35:28 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari , Lars-Peter Clausen , Mark Brown Subject: [PATCHv2 2/2] rtl2832: use custom lock class key for regmap Date: Sun, 21 Dec 2014 00:34:52 +0200 Message-Id: <1419114892-4550-2-git-send-email-crope@iki.fi> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419114892-4550-1-git-send-email-crope@iki.fi> References: <1419114892-4550-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.190.202 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 There was nested locking error shown by lockdep validator when both demod and tuner drivers were using regmap. That is false positive coming from the reason lockdep groups mutexes to 'classes'. That leads situation both tuner driver and demod driver regmap mutex is seen as a same mutex, even those are different ones in a real life. Lockdep uses keys to separate these clock classes. Use custom class key to demod regmap in order to separate it from mutex used by tuner regmap, thus seen it as a different lock also from lockdep point of view. Cc: Lars-Peter Clausen Cc: Mark Brown Signed-off-by: Antti Palosaari --- drivers/media/dvb-frontends/rtl2832.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index f44dc50..6cfe5b6 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -1186,6 +1186,7 @@ static int rtl2832_probe(struct i2c_client *client, .range_max = 5 * 0x100, }, }; + static struct lock_class_key key; static const struct regmap_config regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -1194,6 +1195,7 @@ static int rtl2832_probe(struct i2c_client *client, .ranges = regmap_range_cfg, .num_ranges = ARRAY_SIZE(regmap_range_cfg), .cache_type = REGCACHE_RBTREE, + .lockdep_lock_class_key = &key, }; dev_dbg(&client->dev, "\n");