From patchwork Mon Mar 26 14:00:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Maneyrol X-Patchwork-Id: 10307881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AD9A6600F6 for ; Mon, 26 Mar 2018 14:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96E9E2972B for ; Mon, 26 Mar 2018 14:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E9282973E; Mon, 26 Mar 2018 14:00:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDB532976E for ; Mon, 26 Mar 2018 14:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751127AbeCZOAU (ORCPT ); Mon, 26 Mar 2018 10:00:20 -0400 Received: from mail-by2nam01on0088.outbound.protection.outlook.com ([104.47.34.88]:13257 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751099AbeCZOAT (ORCPT ); Mon, 26 Mar 2018 10:00:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=invensense.onmicrosoft.com; s=selector1-invensense-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=o/M55EIcb36KeNd5mUXeqX4uJC9l8p4vAf6KDuvZKZs=; b=h3j0SiHFgnkD03iN7hGu0Nf1imN3+wVBSzw/Ia9ivBGRAE99cLieAEeDWXjyd4PiXOQvYVjno5k/5h40xJ3MbNZWRfNvPyviuGqy2JFKRfYjvvPkDefrUIHkLabIoLTIuaaDlvevUXoG986G/pXPIPwiehjlSeSLt5IUSYl2vDk= Received: from CY4PR1201MB0184.namprd12.prod.outlook.com (10.172.78.141) by CY4PR1201MB2533.namprd12.prod.outlook.com (10.172.120.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.12; Mon, 26 Mar 2018 14:00:18 +0000 Received: from CY4PR1201MB0184.namprd12.prod.outlook.com ([fe80::6cd9:f753:b84b:7f85]) by CY4PR1201MB0184.namprd12.prod.outlook.com ([fe80::6cd9:f753:b84b:7f85%13]) with mapi id 15.20.0609.012; Mon, 26 Mar 2018 14:00:18 +0000 From: Jean-Baptiste Maneyrol To: linux-iio Subject: [PATCH 2/3] iio: imu: inv_mpu6050: use set_power_itg function in i2c mux Thread-Topic: [PATCH 2/3] iio: imu: inv_mpu6050: use set_power_itg function in i2c mux Thread-Index: AQHTxQqzfwN7AqdxZU+7R+wfFqr+vA== Date: Mon, 26 Mar 2018 14:00:17 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=JManeyrol@invensense.com; x-originating-ip: [92.154.85.143] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR1201MB2533; 7:rgVIJMHi69IQGNnpV1aXOrRWVdnfkP3mN0geka/xCVm47wNKqCHw+jZAD1lpa5dRohq8cknyl/HBQ8RJdp42o1uLPSeNXOhM6bhQNCA8/c17ZXuOSdULsr/eW5H4RXlkGs3BmwcHo5Iol9hKhqCYNtw9KjxtWowE9yr3vCLapQmjkjguT6Kt/LQdyp6D1F/X40GEhBVxqrcZVr7BtMC26vtsj0813zcI6wvnFHWgC2/Z6ngGWk3l71mNPOQSdzg7 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 216b89c2-d0d7-4818-a9a9-08d59321e82c x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR1201MB2533; x-ms-traffictypediagnostic: CY4PR1201MB2533: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(257004950022427)(17755550239193); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:CY4PR1201MB2533; BCL:0; PCL:0; RULEID:; SRVR:CY4PR1201MB2533; x-forefront-prvs: 06237E4555 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(39380400002)(376002)(396003)(39850400004)(199004)(189003)(7696005)(6506007)(97736004)(68736007)(59450400001)(80792005)(5250100002)(6916009)(478600001)(7736002)(25786009)(105586002)(305945005)(3660700001)(316002)(74316002)(86362001)(8676002)(6436002)(72206003)(81156014)(186003)(8936002)(26005)(66066001)(81166006)(33656002)(106356001)(5660300001)(102836004)(9686003)(3846002)(6116002)(53936002)(55016002)(99286004)(2900100001)(2906002)(3280700002)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1201MB2533; H:CY4PR1201MB0184.namprd12.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: invensense.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 3a2Rg021luvy369WA493OC3JjCGC4aXDlloPbsvnpUXZeQ4l5S2TbqrcdQXyZjXndT2nfWUoV+VZTN6msU7R93U3HES7hGLW9iOwzPyks7nOYd1x+u8nEZdePGn+DxAKQYJ8fXZduJ45nbnZMqjuVBDx8vLKzfGUVAOoicpyFfs3M+Q9ULS+r2dqIME563nIE91d9Z/iamyG6YNtijoaqXIR+laxm3kyuGFJrNNCTmFaar/4JH+3IbQydgWZK3+8Ys0VP8Tj/x+anl+Ad0xOT9XvzFuYv9UVVubf7/OOVQdzBgpSc2hg8/6MWc/DIwxwjNCAhXUzQfBwalFwmjfczQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: invensense.com X-MS-Exchange-CrossTenant-Network-Message-Id: 216b89c2-d0d7-4818-a9a9-08d59321e82c X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2018 14:00:17.9675 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 462b3b3b-e42b-47ea-801a-f1581aac892d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2533 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set power function is rewritten manually inside i2c mux select. Better use the already identical existing function. Signed-off-by: Jean-Baptiste Maneyrol --- drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 33 ++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c index fcd7a92..8a8a5bd 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c @@ -29,25 +29,19 @@ static int inv_mpu6050_select_bypass(struct i2c_mux_core *muxc, u32 chan_id) { struct iio_dev *indio_dev = i2c_mux_priv(muxc); struct inv_mpu6050_state *st = iio_priv(indio_dev); - int ret = 0; + int ret; - /* Use the same mutex which was used everywhere to protect power-op */ mutex_lock(&st->lock); - if (!st->powerup_count) { - ret = regmap_write(st->map, st->reg->pwr_mgmt_1, 0); - if (ret) - goto write_error; - usleep_range(INV_MPU6050_REG_UP_TIME_MIN, - INV_MPU6050_REG_UP_TIME_MAX); - } - if (!ret) { - st->powerup_count++; - ret = regmap_write(st->map, st->reg->int_pin_cfg, - INV_MPU6050_INT_PIN_CFG | - INV_MPU6050_BIT_BYPASS_EN); - } -write_error: + ret = inv_mpu6050_set_power_itg(st, true); + if (ret) + goto error_unlock; + + ret = regmap_write(st->map, st->reg->int_pin_cfg, + INV_MPU6050_INT_PIN_CFG | + INV_MPU6050_BIT_BYPASS_EN); + +error_unlock: mutex_unlock(&st->lock); return ret; @@ -59,12 +53,11 @@ static int inv_mpu6050_deselect_bypass(struct i2c_mux_core *muxc, u32 chan_id) struct inv_mpu6050_state *st = iio_priv(indio_dev); mutex_lock(&st->lock); + /* It doesn't really mattter, if any of the calls fails */ regmap_write(st->map, st->reg->int_pin_cfg, INV_MPU6050_INT_PIN_CFG); - st->powerup_count--; - if (!st->powerup_count) - regmap_write(st->map, st->reg->pwr_mgmt_1, - INV_MPU6050_BIT_SLEEP); + inv_mpu6050_set_power_itg(st, false); + mutex_unlock(&st->lock); return 0;