From patchwork Wed Jul 31 03:04:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11067045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E68E14E5 for ; Wed, 31 Jul 2019 03:04:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F20A288A9 for ; Wed, 31 Jul 2019 03:04:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20094288B8; Wed, 31 Jul 2019 03:04:24 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 B6F85288A9 for ; Wed, 31 Jul 2019 03:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727360AbfGaDEX (ORCPT ); Tue, 30 Jul 2019 23:04:23 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35890 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725851AbfGaDEX (ORCPT ); Tue, 30 Jul 2019 23:04:23 -0400 Received: by mail-pf1-f196.google.com with SMTP id r7so30965682pfl.3; Tue, 30 Jul 2019 20:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nLKtWBaUclJcLSqz62oSyWuxJqyS+0P5ZZaa8NbQc7U=; b=mD7angjbJddZ1j4BHdjhB2jtUDu5Rz+DOMlgZ7q36CRlKC6d/jKgxcWDPkWs2N7p0j yct+h7lmEZqZ9PYTGOZXMQ5Vl+49aIEvDcm4pine2z/hP90BJGMvN620Asl3Ua27tJ/9 +kiarBRAe/QI0tXIWtUX+BBoCfDp81WAG2U5OKGjMX10TeblSOC7YwsMvedjHFIBINub fEj6Vp6+ax37QhoUepCfjV32YGld8minfWZV1wj6CGMmzwWtnSOO4GIwyxBe9dXC+dqs 18/euesbxu6WPILV9oqoZL/uk0AedaOg3VdwtMCzB0rh+kxN/p7jx5GZw1ey7ugkVuYw 0Mrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nLKtWBaUclJcLSqz62oSyWuxJqyS+0P5ZZaa8NbQc7U=; b=nwvHbkaOwQaHhS9PHb4ln9MAB+1qqLB8vatEe2xbKbOMFqxtJj2xIHBlGyA0QnHrkl Ngfc9/fXRY0jazOzbBNykWSIlJK6zurk87pZ/660+3eifd1ZBDWLu0/PsAKFdFUaWrys /jBsPQF4mUxfVaUkBoQ4wRvdD2UACBe0kAqYeUTKeLxygacOXPHMiW0foyVOeNtCx+i2 u/YxIEK/nU8cWSZuVs/zXd9vp4iR81mTO8Xr8ZARNEo4j54JZlHx277D4y9cQSKaXOpT IIWzDuX9NAt5oen+G/Nc8iMKBZbxMlnKF6k8h1zV+pE+VHEqXWwn9yswX9tHU+l9Dn/P jIiA== X-Gm-Message-State: APjAAAX1nUEZuNi6KSvQxYIh6Tt1EhGrayIIb6QfHgZItwf/ZT6FNInX 1IhMpLPRYuS42uu+kp+eJHI= X-Google-Smtp-Source: APXvYqy6HZ540jFPOqegcCeDr4kcKSF+JKz8R+pobxIf4BzqW2IXGHKkT3SCbitOioukD2PvNukfUQ== X-Received: by 2002:aa7:8383:: with SMTP id u3mr45104326pfm.175.1564542262254; Tue, 30 Jul 2019 20:04:22 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id g1sm107429981pgg.27.2019.07.30.20.04.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 30 Jul 2019 20:04:21 -0700 (PDT) From: Chuhong Yuan Cc: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Brian Masney , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH v3 1/2] iio: tsl2772: Use device-managed API Date: Wed, 31 Jul 2019 11:04:15 +0800 Message-Id: <20190731030415.8062-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) 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 Use devm_() APIs to simplify the code. Signed-off-by: Chuhong Yuan --- Changes in v3: - Split v2 into two patches. drivers/iio/light/tsl2772.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c index 83cece921843..f1134f183be7 100644 --- a/drivers/iio/light/tsl2772.c +++ b/drivers/iio/light/tsl2772.c @@ -860,6 +860,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev) return tsl2772_write_control_reg(chip, 0x00); } +static void tsl2772_chip_off_action(void *data) +{ + struct iio_dev *indio_dev = data; + + tsl2772_chip_off(indio_dev); +} + /** * tsl2772_invoke_change - power cycle the device to implement the user * parameters @@ -1807,10 +1814,10 @@ static int tsl2772_probe(struct i2c_client *clientp, return PTR_ERR(chip->vdd_supply); } - ret = devm_add_action(&clientp->dev, tsl2772_disable_regulators_action, + ret = devm_add_action_or_reset(&clientp->dev, + tsl2772_disable_regulators_action, chip); if (ret < 0) { - tsl2772_disable_regulators_action(chip); dev_err(&clientp->dev, "Failed to setup regulator cleanup action %d\n", ret); return ret; @@ -1877,15 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp, if (ret < 0) return ret; - ret = iio_device_register(indio_dev); - if (ret) { - tsl2772_chip_off(indio_dev); - dev_err(&clientp->dev, - "%s: iio registration failed\n", __func__); + ret = devm_add_action_or_reset(&clientp->dev, + tsl2772_chip_off_action, + indio_dev); + + if (ret < 0) return ret; - } - return 0; + return devm_iio_device_register(&clientp->dev, indio_dev); } static int tsl2772_suspend(struct device *dev) @@ -1922,17 +1928,6 @@ static int tsl2772_resume(struct device *dev) return tsl2772_chip_on(indio_dev); } -static int tsl2772_remove(struct i2c_client *client) -{ - struct iio_dev *indio_dev = i2c_get_clientdata(client); - - tsl2772_chip_off(indio_dev); - - iio_device_unregister(indio_dev); - - return 0; -} - static const struct i2c_device_id tsl2772_idtable[] = { { "tsl2571", tsl2571 }, { "tsl2671", tsl2671 }, @@ -1979,7 +1974,6 @@ static struct i2c_driver tsl2772_driver = { }, .id_table = tsl2772_idtable, .probe = tsl2772_probe, - .remove = tsl2772_remove, }; module_i2c_driver(tsl2772_driver); From patchwork Wed Jul 31 03:04:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 11067047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 890061823 for ; Wed, 31 Jul 2019 03:04:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74013288A9 for ; Wed, 31 Jul 2019 03:04:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67550288B8; Wed, 31 Jul 2019 03:04:31 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 E8F0C288A9 for ; Wed, 31 Jul 2019 03:04:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728314AbfGaDEa (ORCPT ); Tue, 30 Jul 2019 23:04:30 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45369 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725851AbfGaDEa (ORCPT ); Tue, 30 Jul 2019 23:04:30 -0400 Received: by mail-pf1-f193.google.com with SMTP id r1so30954589pfq.12; Tue, 30 Jul 2019 20:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2QlSNFu1dUP/B+me4BxUHR+T/odrpULH3hEpS4tUUw4=; b=ckulWYQxKGqN0gL07+zGTez6TKJF8tj/3lZ62irYXJ7y1iFf1MlrxmB4ROIkixOxjj XC0Ufrh0Wvcyjb4TkZcENx6Wjuc1ct1J6ZK8jJs2JUlJ2Ui/PIsbHpFjhJYlFRGVz5UL 64ZHunpH9BqgEIRQh2reKRoO4z44QQSRy8XNfq8dCHIIdEgKCk8zYvBRpr+2rCCaZHoc 9XMRqnx3G2cB4AlAoKGSdi+SyMwyAwbQIFCcG1UAaGxHD09xq04lPVDwvhEX+a277ybZ 3ppGTDgsZTOpw+XmJJGioB6JlXkl23xOWJXti9aSeIirnlDInV2v4+qOIp1Pcq3rFMYD RKIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2QlSNFu1dUP/B+me4BxUHR+T/odrpULH3hEpS4tUUw4=; b=OjRg2AiHUeDfq5nT2DndI6Sv6loL1e29tJBjnsUN5YYIpsGTDNDQ7UeZ5ixhLPujVo C3zj68g5YmriT5Cwmw3STpFBPaMI96RbmhnirsYfkyejpmKdcIvVSRGNwFjIFcU+pQEV PuEwz/hsrXcvJpRbVa16gT7UgzvcF6NnImiVvUorlQTmBxBgpWtbiPDKBjEZZpauOdQl E73Fu9MQy6cWbf9BWKK2DIOVLJMXfbO8VvaPtXZUarGsQT24pkdOy+84UOs1C1oj/B4h /s1EuTGrBmqazuaUrHjfH4uHWluzR9M07pSf4jp/Tc4Q/Y2038f1mGonWbrA3GXTvaoH vVIQ== X-Gm-Message-State: APjAAAWu7GZ6GJs2LrQ7Xesn1y46rShextyV7SQ3StJ0hGFesA4Jo6b9 PG30stzr8jQ6b3+X8jYMyCE= X-Google-Smtp-Source: APXvYqzRXjCa+vOghPaFFnUFCaSDvH1hb4p8C2pMxazM3TJcBBqn25U7CXpW2jietlsHNl5XtOuYTw== X-Received: by 2002:aa7:8189:: with SMTP id g9mr45703459pfi.143.1564542269261; Tue, 30 Jul 2019 20:04:29 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([89.31.126.54]) by smtp.gmail.com with ESMTPSA id f8sm34351930pgd.58.2019.07.30.20.04.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 30 Jul 2019 20:04:28 -0700 (PDT) From: Chuhong Yuan Cc: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Brian Masney , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH v3 2/2] iio: tsl2772: Use regulator_bulk_() APIs Date: Wed, 31 Jul 2019 11:04:23 +0800 Message-Id: <20190731030423.8116-1-hslester96@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) 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 Use regulator_bulk_() APIs to shrink driver size. Signed-off-by: Chuhong Yuan --- Changes in v3: - Split v2 into two patches. - Add dev_err to log error messages. - Add a check for EPROBE_DEFER. drivers/iio/light/tsl2772.c | 82 +++++++++++-------------------------- 1 file changed, 24 insertions(+), 58 deletions(-) diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c index f1134f183be7..fd6d44297dba 100644 --- a/drivers/iio/light/tsl2772.c +++ b/drivers/iio/light/tsl2772.c @@ -134,6 +134,12 @@ enum { TSL2772_CHIP_SUSPENDED = 2 }; +enum { + TSL2772_SUPPLY_VDD = 0, + TSL2772_SUPPLY_VDDIO = 1, + TSL2772_NUM_SUPPLIES = 2 +}; + /* Per-device data */ struct tsl2772_als_info { u16 als_ch0; @@ -161,8 +167,7 @@ struct tsl2772_chip { struct mutex prox_mutex; struct mutex als_mutex; struct i2c_client *client; - struct regulator *vdd_supply; - struct regulator *vddio_supply; + struct regulator_bulk_data reg[TSL2772_NUM_SUPPLIES]; u16 prox_data; struct tsl2772_als_info als_cur_info; struct tsl2772_settings settings; @@ -697,46 +702,7 @@ static void tsl2772_disable_regulators_action(void *_data) { struct tsl2772_chip *chip = _data; - regulator_disable(chip->vdd_supply); - regulator_disable(chip->vddio_supply); -} - -static int tsl2772_enable_regulator(struct tsl2772_chip *chip, - struct regulator *regulator) -{ - int ret; - - ret = regulator_enable(regulator); - if (ret < 0) { - dev_err(&chip->client->dev, "Failed to enable regulator: %d\n", - ret); - return ret; - } - - return 0; -} - -static struct regulator *tsl2772_get_regulator(struct tsl2772_chip *chip, - char *name) -{ - struct regulator *regulator; - int ret; - - regulator = devm_regulator_get(&chip->client->dev, name); - if (IS_ERR(regulator)) { - if (PTR_ERR(regulator) != -EPROBE_DEFER) - dev_err(&chip->client->dev, - "Failed to get %s regulator %d\n", - name, (int)PTR_ERR(regulator)); - - return regulator; - } - - ret = tsl2772_enable_regulator(chip, regulator); - if (ret < 0) - return ERR_PTR(ret); - - return regulator; + regulator_bulk_disable(ARRAY_SIZE(chip->reg), chip->reg); } static int tsl2772_chip_on(struct iio_dev *indio_dev) @@ -1804,14 +1770,21 @@ static int tsl2772_probe(struct i2c_client *clientp, chip->client = clientp; i2c_set_clientdata(clientp, indio_dev); - chip->vddio_supply = tsl2772_get_regulator(chip, "vddio"); - if (IS_ERR(chip->vddio_supply)) - return PTR_ERR(chip->vddio_supply); + chip->reg[TSL2772_SUPPLY_VDD].supply = "vdd"; + chip->reg[TSL2772_SUPPLY_VDDIO].supply = "vddio"; - chip->vdd_supply = tsl2772_get_regulator(chip, "vdd"); - if (IS_ERR(chip->vdd_supply)) { - regulator_disable(chip->vddio_supply); - return PTR_ERR(chip->vdd_supply); + ret = devm_regulator_bulk_get(&clientp->dev, ARRAY_SIZE(chip->reg), + chip->reg); + if (ret < 0) { + if (ret != -EPROBE_DEFER) + dev_err(&clientp->dev, "Failed to get regulators: %d\n", ret); + return ret; + } + + ret = regulator_bulk_enable(ARRAY_SIZE(chip->reg), chip->reg); + if (ret < 0) { + dev_err(&clientp->dev, "Failed to enable regulators: %d\n", ret); + return ret; } ret = devm_add_action_or_reset(&clientp->dev, @@ -1901,8 +1874,7 @@ static int tsl2772_suspend(struct device *dev) int ret; ret = tsl2772_chip_off(indio_dev); - regulator_disable(chip->vdd_supply); - regulator_disable(chip->vddio_supply); + regulator_bulk_disable(ARRAY_SIZE(chip->reg), chip->reg); return ret; } @@ -1913,16 +1885,10 @@ static int tsl2772_resume(struct device *dev) struct tsl2772_chip *chip = iio_priv(indio_dev); int ret; - ret = tsl2772_enable_regulator(chip, chip->vddio_supply); + ret = regulator_bulk_enable(ARRAY_SIZE(chip->reg), chip->reg); if (ret < 0) return ret; - ret = tsl2772_enable_regulator(chip, chip->vdd_supply); - if (ret < 0) { - regulator_disable(chip->vddio_supply); - return ret; - } - usleep_range(TSL2772_BOOT_MIN_SLEEP_TIME, TSL2772_BOOT_MAX_SLEEP_TIME); return tsl2772_chip_on(indio_dev);