From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755308AbcEDURX (ORCPT ); Wed, 4 May 2016 16:17:23 -0400 Received: from mail-db5eur01on0095.outbound.protection.outlook.com ([104.47.2.95]:4416 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755147AbcEDUQy (ORCPT ); Wed, 4 May 2016 16:16:54 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: CC: Peter Rosin , Wolfram Sang , Jonathan Corbet , Peter Korsgaard , Guenter Roeck , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald , Antti Palosaari , Mauro Carvalho Chehab , Rob Herring , Frank Rowand , Grant Likely , Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Kalle Valo , Jiri Slaby , Daniel Baluta , Lucas De Marchi , Matt Ranostay , Krzysztof Kozlowski , Hans Verkuil , Terry Heo , Arnd Bergmann , Tommi Rantala , Crestez Dan Leonard , , , , , Subject: [PATCH v9 9/9] [media] rtl2832: regmap is aware of lockdep, drop local locking hack Date: Wed, 4 May 2016 22:15:35 +0200 Message-ID: <1462392935-28011-10-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462392935-28011-1-git-send-email-peda@axentia.se> References: <1462392935-28011-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: AM3PR04CA0090.eurprd04.prod.outlook.com (10.163.180.144) To VI1PR02MB1312.eurprd02.prod.outlook.com (10.165.231.154) X-MS-Office365-Filtering-Correlation-Id: 662c8fe6-1a70-4dcb-85ba-08d37458fc5c X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;2:BtVA3a3vFEmCdAzUrnhoMEew1WIwWScyzAqxHqLIK7oN0a4+WahuYtaYgsOIJU34bj9S+5SJqiF4ik8TyRxtaXCLONX6TJFcTebGOJs5XmhgsT9L+uITEsIkUcRTlFwQLXRoxfpj6PMT50mBT8HJARJZUoEM86YlKGb3ZVI9TLE5QZmsDnVb9Kc0vw0gPfts;3:U2t2qTq0ImFhBvSJcQaYXUcfmf5E6Ol18Nl9BI2P/jbzeKGuOcTwMYxwO0IHKFYbRilt0vTGYFpUzv1vBdW7kskugm215dqXNFmnNbWsZD5xH/k0gCCTPprBIaIHkA2R X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1312; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;25:0M6i1A+h5xJeJ9G90eKsoVLvLbjNF3WSbK9CwyfIFTamaHY3HkZ3seK/+hsT+29sgEe4A5gBUA79ZM0MjpIeSYWp4i0iVPqlZxXAEg4ETwkEyhcok3x0Cd4SzpNfRAN0HvZaIlhT1pyk4I8wS0E/tPtYPPF0cdvJ2HjHx2VqlDGSVkbXipjqVqBJZi2fwE7gg2GhfYpe5rwpTvl1l3fBYLtroc/1/hj7JSFdjKIx+8lObNkfnHUn3denYAZWPUqsBO9Djk/Bd6bpvxJkdvAABttYFvdyci4NMG38oT7PfmOgn35yNUVo17pyanpPQsm2z5RBHEe1vYqm1vYJRQDp9cG+fbNER0XzzSqq5YF/+nYtbuK6BniXzPCRX7IOudUjfFDilA70mCMqJ4LzSIneZg3Xf6RytbN69xNOkqwEwNo7NgiDp/WgDLsEkNOkaYmcqw4ZOW+5lxcj2UGq7KQ8hlT/tmHCMpGKX2tTtM5urIfiHF32qORnfW5yx4vq5exVc5jMRtrofoOlRT/VMnus9qV4WCCoGEuVWKpLDGACmiDUuHnIQ8QHQKg/AM3pJ1qap+LY4ZxIvgE8UWIu2KTTs3qTf65l7B/bNazOe4ijKesVm6ZiuV3VhBfKRxlLPrDrqkmdxNjS5SmB+yJRmqOMsuaWf58wvwh8vzXOjBuy+/fbuoggpY9puNepvMwKj+FnNV3ZStFwPak7jKnVFiGUfZxKO/uBg2SzQcivEZt3LPFgPaJmsMopeKpJxJNUOLtu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101528026)(9101521098)(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR02MB1312;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1312; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;4:ykiJel5oT9o8XP/dkbgFyM+zic9KK8LVy9euRTfC5pourjtSco+q1ze50sgeCuUvb3Py8bmYMXfM/rKzsCEVk9zqk7LvYSGX+zySCceGkbvkR90u8CKrj76GE1dL2vnyDvtQYBkbTjlBVHNhoWKWsHUsEJFqFm1yJK6KKrTXlG3LPvzvOneFytFk8VuTjUmdGEiBbr0DhTsVx/XeLCToT92c3vbHd/fGr9o2eSGq2vf5SHIe+NynF3IuOUNxc1mQj2auvSwb/4mj0VxdO42anGjtG59MIzzb3RhpE6UtVEfYoDe8R2B0tZP8pxUxvLrRslOOe7Knwos/cQABGxrqJslpkCXs+9XjrSRZ201MJEd1LT9QwDQk031gyOlold+8cGvXnEmv+ICDbD4iauPG0a7NTACaVFqG3iqJoacP39ENnEFZibVb//KNHHRNi9dPRQxF8DpFJt4j+7lvmK0Boa8HGxdlNzacqjxYz8qOIyE= X-Forefront-PRVS: 093290AD39 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(4326007)(19580405001)(86362001)(2351001)(229853001)(189998001)(586003)(6116002)(3846002)(19580395003)(110136002)(33646002)(47776003)(74482002)(81166005)(2906002)(50466002)(92566002)(48376002)(50986999)(77096005)(76176999)(5003940100001)(42186005)(50226002)(5004730100002)(2950100001)(36756003)(5008740100001)(7059030)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR02MB1312;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;23:8B73/KZxn9fUa1v0ZTI2GJaVEktYDIL82kwNrmplmgLfL1Ct0OeJR9XjhoDdy+pD7UvCXNf6LHp0qWhhOcrAES/qI1fs0Xrdb7LSDA+VhS9nDtsstz3GbeYGUjunnWgcN+DGjyrqDSAn5zhWbVc+nGB6TscaQqWr7cxHw1nUmFNNvV3zGaqSNU0neLoOxPItzUx/mXpgQsAOYLQuRZAspN2miH+gq6rPoFjxIRQNeQwMhI36Y0xo8HASakIihIzVGr2u4ORWVxkpflQ1Cr+uO126+Un+/oJVSUKy7PMXlzDzU1G6Eyk9ZXX0REWui7zs8CYSqiYfBTv7n+DjXn46jWqtytIFmRVNQrFxyCRV63vVcAQqqFhBiHQ8zEQ+1wOQBRas7gCPaADQcDgqHpLY15w7W3CFadZp6ve0lRVgelITuliDF1GnvjBnugLyX8ws99drWdWjhAHYUwqZJ/0dPFAH50uZphcnSgoIKC7zXgfG0GkkuCj2epkvXjTt6uQ54Xnj25CSBJ1nvH1Q+vYRstYgsKNefh18kvBmuKerMhoi+xhfNfYriACNwxqAAQQtLjuoNi5q7a8HoS5cyBmrN+4Oj+3zpPxVFUJ0knwqXsSOX4bLPGA8XhqY863I9HkmTeQ3Pk3NDYavadyy2cRevJtRkgKHXbtNY3te+4T5WjhaCylNgrp5YiZEXpcTOEf22WVCrWGoe7FOYwl4PSZyltJDawg09FMfahRlSvT3jzF0rBpjVdqOc1nvhguNNmgH+yRQqje2wjXtE9mOcbZFsj3aW7a7w0Jk79XCAJQCjvPt3O5Sdctf2TMe908o1tqTkcCY36e+hMVTE3Sd+bL5RkqjbOaPapPg6s31kMA7L0vay2B2/Dk8eY9wYK0SX2iR//L+QGd9klN0vqx9shLReA== X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;5:Bp4eDKTLsySYYnvwBidmFjh3fB81nQtaYg67peA29s+qbr5WZdDInOGuNXOSlSdIviVovbevX6SiI8VE3ro+esx1HuoG1yVVSMZrf6d0QWMsnBADA3ubHYFW3pxdwS0FWgp2Y2S3c/bLPf8tcZ2iCg==;24:DKUkTdZCtcgJYdQkN3lIxRkWIZpTUTHj33cFGRAJ85GM3JFQFz8NRb9khJ+fllIkoI2DDEl5lDH+cq8Dj1vKk5iQ4s0Zw4dM546Jehck88Q=;7:ozQH99xtqWBzuCkhbQd6vN0kkJpaT7izx23LziP1B8pu3NHj7M/spLEJ3un8mC+N+9d68n7LjVyCZwpuSpf4ybc1EwukUGzsUJVGvrm1/45EKilEjRrzSWn6Y7+GZc83uaMgs4efJXBTkNz6+K/rY4wTEz3As3MU5cVh2p6ku2NHwwdFhGKbFn/oax2r+c75 SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 20:16:29.8143 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR02MB1312 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tested-by: Antti Palosaari Reviewed-by: Antti Palosaari Signed-off-by: Peter Rosin --- drivers/media/dvb-frontends/rtl2832.c | 30 ------------------------------ drivers/media/dvb-frontends/rtl2832_priv.h | 1 - 2 files changed, 31 deletions(-) diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 957523f07f61..bfb6beedd40b 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -890,32 +890,6 @@ static bool rtl2832_volatile_reg(struct device *dev, unsigned int reg) return false; } -/* - * FIXME: Hack. Implement own regmap locking in order to silence lockdep - * recursive lock warning. That happens when regmap I2C client calls I2C mux - * adapter, which leads demod I2C repeater enable via demod regmap. Operation - * takes two regmap locks recursively - but those are different regmap instances - * in a two different I2C drivers, so it is not deadlock. Proper fix is to make - * regmap aware of lockdep. - */ -static void rtl2832_regmap_lock(void *__dev) -{ - struct rtl2832_dev *dev = __dev; - struct i2c_client *client = dev->client; - - dev_dbg(&client->dev, "\n"); - mutex_lock(&dev->regmap_mutex); -} - -static void rtl2832_regmap_unlock(void *__dev) -{ - struct rtl2832_dev *dev = __dev; - struct i2c_client *client = dev->client; - - dev_dbg(&client->dev, "\n"); - mutex_unlock(&dev->regmap_mutex); -} - static struct dvb_frontend *rtl2832_get_dvb_frontend(struct i2c_client *client) { struct rtl2832_dev *dev = i2c_get_clientdata(client); @@ -1082,12 +1056,8 @@ static int rtl2832_probe(struct i2c_client *client, dev->sleeping = true; INIT_DELAYED_WORK(&dev->i2c_gate_work, rtl2832_i2c_gate_work); /* create regmap */ - mutex_init(&dev->regmap_mutex); dev->regmap_config.reg_bits = 8, dev->regmap_config.val_bits = 8, - dev->regmap_config.lock = rtl2832_regmap_lock, - dev->regmap_config.unlock = rtl2832_regmap_unlock, - dev->regmap_config.lock_arg = dev, dev->regmap_config.volatile_reg = rtl2832_volatile_reg, dev->regmap_config.max_register = 5 * 0x100, dev->regmap_config.ranges = regmap_range_cfg, diff --git a/drivers/media/dvb-frontends/rtl2832_priv.h b/drivers/media/dvb-frontends/rtl2832_priv.h index d8f97d14f6fd..c1a8a69e9015 100644 --- a/drivers/media/dvb-frontends/rtl2832_priv.h +++ b/drivers/media/dvb-frontends/rtl2832_priv.h @@ -33,7 +33,6 @@ struct rtl2832_dev { struct rtl2832_platform_data *pdata; struct i2c_client *client; - struct mutex regmap_mutex; struct regmap_config regmap_config; struct regmap *regmap; struct i2c_mux_core *muxc; -- 2.1.4