From patchwork Mon Nov 26 02:59:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10697529 X-Patchwork-Delegate: rjw@sisk.pl 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 70CFD16B1 for ; Mon, 26 Nov 2018 02:59:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52F51298BD for ; Mon, 26 Nov 2018 02:59:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42AB9298C3; Mon, 26 Nov 2018 02:59:56 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 2A2F9298BD for ; Mon, 26 Nov 2018 02:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726118AbeKZNwb (ORCPT ); Mon, 26 Nov 2018 08:52:31 -0500 Received: from mail-eopbgr10085.outbound.protection.outlook.com ([40.107.1.85]:57305 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726106AbeKZNwb (ORCPT ); Mon, 26 Nov 2018 08:52:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IwGSA6oHTM0zZaQag2fxBLitVED3Yr+qg39o/94xKo4=; b=Z9IunLU3tSxwIIhpnfzYVR7dW4C8qMhzmUHW6WhWhZy9nquUr9jYux/Iiw+rBO/tUXqucahYMRW4PPiEijnI2joszDP7kViaW9JWu+EDwn5G6OTjZ+LE9e9QRuUuYJzSnJ4JLRRidRkkfggCFAhtyhpIi/Kr0EqkKQAizcM8ZK8= Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com (52.134.72.18) by DB3PR0402MB3769.eurprd04.prod.outlook.com (52.134.71.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Mon, 26 Nov 2018 02:59:45 +0000 Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd]) by DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd%2]) with mapi id 15.20.1361.019; Mon, 26 Nov 2018 02:59:45 +0000 From: Anson Huang To: "rjw@rjwysocki.net" , "viresh.kumar@linaro.org" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: dl-linux-imx Subject: [PATCH 1/2] cpufreq: imx6q: remove unused code Thread-Topic: [PATCH 1/2] cpufreq: imx6q: remove unused code Thread-Index: AQHUhTQWmmMVKzplmUeqXFokY2bfOA== Date: Mon, 26 Nov 2018 02:59:45 +0000 Message-ID: <1543200853-10029-1-git-send-email-Anson.Huang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR0302CA0024.apcprd03.prod.outlook.com (2603:1096:202::34) To DB3PR0402MB3916.eurprd04.prod.outlook.com (2603:10a6:8:10::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DB3PR0402MB3769;6:w9f/f9Ed3llb4mvRgzHPosKXD9mbshggMGZjJ8b+7f6//B38TvbgxaQPIgYMihwigXgh9lwtaOvO6AS7JGFY5Wk8+Hjlm2y3GiFke+AwIs0Ya7vejCt6GQZN7sPOGTG5mbhsmo1vCNjcR96Qq909jkLTfdks4I8Ux484dtrK4EGSdqHijESBr3kQBvLLRdysU8I3pCqkW6FzcNt503HZA3ukPjwts5Qi8m93rbU2h4aYih44jYrn8a97qp+LUWrMkRgeIQ8sN7Q1N4yt2VsYiwNWfYc6uYssp8+ixXgO4TQ03x0CnHTFMPXuXHop9LkJAieAl8bBooaKsCMT+IV6vLpsWIgZN0/j9z0LOhPe4a42xhzXHTjcTuj+Y8UoRbHhyig5IkoJMbq35FAU7QKtm7BY2kZxAXfXI5nXVv3YQnGbssToun4DdyNN9UTD5uFUhmYnsjuePQM3wB70eXSvHg==;5:4wfLtrkUc4/4oRkc9mhDE5YDqx2blLMtaqZngG7kmVMnwQoF8fX7FoDuKTSPW5YiZS5ntrAbbYN9FFEDwq+jBbzksiLFqEXINYgyTQhlATN0iM/C0W1Q6b93s0VbCMkj1l1/LQEwEr9wvsuwsm+0YyhiCSw5vtd9vxohyDL9ft4=;7:uEQktd+hxv1USa7d1LGKGDFzBfVXVV2NS6vBJFIGW44CdV8Ij1XmfoPVjrQd4omGWQ1iSUY3iDvUlmL4vhYA4igw5KCZQ7Iij6QHuF71N7cmFm59SORbPDvpRbExCdlxAXvcMcrLxukJZ+G+dJypPQ== x-ms-office365-filtering-correlation-id: fba74431-feef-48b9-bd7f-08d6534b3836 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:DB3PR0402MB3769; x-ms-traffictypediagnostic: DB3PR0402MB3769: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231442)(944501410)(52105112)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:DB3PR0402MB3769;BCL:0;PCL:0;RULEID:;SRVR:DB3PR0402MB3769; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(136003)(189003)(199004)(110136005)(316002)(25786009)(2501003)(6116002)(3846002)(14454004)(36756003)(478600001)(97736004)(81166006)(81156014)(8676002)(486006)(66066001)(2616005)(476003)(50226002)(6436002)(71190400001)(102836004)(53936002)(26005)(186003)(5660300001)(6486002)(68736007)(4326008)(2906002)(71200400001)(106356001)(99286004)(105586002)(52116002)(6512007)(8936002)(7736002)(86362001)(6506007)(386003)(256004)(2201001)(305945005)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR0402MB3769;H:DB3PR0402MB3916.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: NIs3FIdDU42MjiiaqRt2MLQ/9tporfLPVw9/eXameXztVGkBPZuktLz+L0HTfpAHVJWBleVjhLXIbhegTPq8qIUXeuH8nYC4qP6FtatBCq54lg8m5JJ8lS23gYzOtaXCDYo27xP14eHb02mL/Y8w1gnas4Xi9DR+CEza1BwC+zXu/15ysBci+A9Iin+K3z0mo50+IyY2m05HrmOPL3yo+kHzAQNB7f4s48c2cjYy82Ja513f+00Vlog62UvPGnhtX0fW8QBhL56/NyqPngofOU/+yQQHhIRg4H5pGNAd3ZqHta7vjNUUMpfOTsoPufnJNsvA4eHdvx8l9EAasw0l94IZT0+/1KSwBXmbEZaB0qg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fba74431-feef-48b9-bd7f-08d6534b3836 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 02:59:45.7768 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3769 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In voltage scale down path, the return value is NOT used at all, remove them to simplify the code. Signed-off-by: Anson Huang Acked-by: Viresh Kumar --- drivers/cpufreq/imx6q-cpufreq.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index d8c3595..8cb9683 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -177,22 +177,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) /* scaling down? scale voltage after frequency */ if (new_freq < old_freq) { ret = regulator_set_voltage_tol(arm_reg, volt, 0); - if (ret) { + if (ret) dev_warn(cpu_dev, "failed to scale vddarm down: %d\n", ret); - ret = 0; - } ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0); - if (ret) { + if (ret) dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret); - ret = 0; - } if (!IS_ERR(pu_reg)) { ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0); - if (ret) { + if (ret) dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret); - ret = 0; - } } } From patchwork Mon Nov 26 02:59:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10697531 X-Patchwork-Delegate: rjw@sisk.pl 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 6521D16B1 for ; Mon, 26 Nov 2018 03:00:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52ED3298C4 for ; Mon, 26 Nov 2018 03:00:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40F14298C3; Mon, 26 Nov 2018 03:00:02 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 221A0298BD for ; Mon, 26 Nov 2018 02:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726106AbeKZNwd (ORCPT ); Mon, 26 Nov 2018 08:52:33 -0500 Received: from mail-eopbgr10085.outbound.protection.outlook.com ([40.107.1.85]:57305 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726247AbeKZNwd (ORCPT ); Mon, 26 Nov 2018 08:52:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EoS+ArSWKFpL2V8lboAdBPoM+ykF0YoAVkybo2JbD+Y=; b=SbKRspB60AX6YrGe3CfLpQ5WO+sdh+MiHSKyRpayLzClH7j7Nrz4WdEPxatGwwUwV9H/cxn4ObQCid6GUg1OdchdOtBhr624gCXjwSJVnUANNhNBKjBB0n07cKxlRonwvgqPrfQ25kh7qpN1HV2sZJFYz9qGEilXnqRzIXmUQpo= Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com (52.134.72.18) by DB3PR0402MB3769.eurprd04.prod.outlook.com (52.134.71.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Mon, 26 Nov 2018 02:59:48 +0000 Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd]) by DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd%2]) with mapi id 15.20.1361.019; Mon, 26 Nov 2018 02:59:48 +0000 From: Anson Huang To: "rjw@rjwysocki.net" , "viresh.kumar@linaro.org" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: dl-linux-imx Subject: [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Thread-Topic: [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Thread-Index: AQHUhTQXZn3eaYnau0ao9J26clzIJw== Date: Mon, 26 Nov 2018 02:59:48 +0000 Message-ID: <1543200853-10029-2-git-send-email-Anson.Huang@nxp.com> References: <1543200853-10029-1-git-send-email-Anson.Huang@nxp.com> In-Reply-To: <1543200853-10029-1-git-send-email-Anson.Huang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR0302CA0024.apcprd03.prod.outlook.com (2603:1096:202::34) To DB3PR0402MB3916.eurprd04.prod.outlook.com (2603:10a6:8:10::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DB3PR0402MB3769;6:tO8spQ7MYGXfvBDSZRfIsjtBxHaCwPRK4uUv1q0gclZXI87nUQLIWBFFp3WHTJdW4C6cuogtCGCA+Av+uUITM++mQOyAmGrZINstkbMqaO564KBs7WOaJjNg6jQtTFsYt+Oy9wcseE1jZl3NWDHQaOJ228auBl0EdNtB8xBU4e3NZJT1dPUueXNe/R/y01OWKQJqiZ7tgPRC9xshyquGGCBMw2KPkUjv7vtnK8xZ0zBUws08Qv/DU6rgCQFb45EvZtHlb+cuSyXkQrpLbR2ZyzIbCBLlUKic9XR9magCVDqx0rzY90VHOyVWZtkbGzH6zmuApJpmLoKKDibyhz4LhHHwiBK+xZIzjj0Ts+FeIgvzkUm6rj0zNJRipsUsFZ5mxJaRJkz2utUiqP8cvPeN3jxiFsVc81gH2DUmfJVSh5HQ9st0zqvVktsSlR7DbM79B5wbyFPwRjjYdBHanQD+Jw==;5:pTgkyOslXXzOdUw10V8T/uJ6Klwz4+meGZX2f9bF+7Nr6Z38Vka+F1e/6z4Xgw9FbBilwAzbUEYcgl+DWlVtakkcqTCy/nLpi1BqOHowpx+UE4lJoWFzFNDtGuwzRNOxXJWxHLPXN5sHJZ4j/Es1+IISPuQ/rXHpRwDQwaQ/SA0=;7:k3ZQllyKvCXjnlp08MfXf3DrbJCqqndfT5cCHu4wPHOjN7ahEYvnVUK/NenryeysuErebYgGD6OoxMM/T4XDJ/4LKOEcHjyAo4MXCPrGOZCDtOhJN1a/spsFMmv1mxOnwmASIMLBaamCcmAc48w/SA== x-ms-office365-filtering-correlation-id: 01646419-7c8a-4db5-8658-08d6534b3a00 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:DB3PR0402MB3769; x-ms-traffictypediagnostic: DB3PR0402MB3769: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231442)(944501410)(52105112)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:DB3PR0402MB3769;BCL:0;PCL:0;RULEID:;SRVR:DB3PR0402MB3769; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(136003)(189003)(199004)(110136005)(316002)(25786009)(2501003)(6116002)(3846002)(14454004)(36756003)(478600001)(97736004)(81166006)(81156014)(8676002)(486006)(66066001)(2616005)(476003)(50226002)(6436002)(71190400001)(76176011)(102836004)(53936002)(26005)(186003)(5660300001)(6486002)(68736007)(4326008)(11346002)(446003)(2906002)(71200400001)(106356001)(99286004)(105586002)(52116002)(6512007)(8936002)(7736002)(86362001)(6506007)(386003)(256004)(2201001)(305945005)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR0402MB3769;H:DB3PR0402MB3916.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Ww5WTM90Cj4wWi0s+t33qp1RMHINffQvsIb9+HOl/2kc5eUsSimMZOnd/SQ0pd7kIC3NVIg5mq9gG4bz49Qqy15u57ssyBWnTBHsAMkU1EPny7He8dnylsisHciPMYLPngozRZa2GBZctPp/+7+m/hpYrWpR0f6LRovcklhka6YrRoQE/wEepeO08pDZKjHnQTwc7PCilrVRqjFh7X8x3gKUR6VU5hbB37tq9tIOke5/KsekT37/9VwsqXmB5sp2PQRIQJoM3iu2+a3juMjspLW9sthRP3O8T8vj/ChWHW0D38Z+MJh94CaTxYT153vClnrCrBKA2Z0t5id8lw6qUBs4RSEOKpHQl3u2Ny+WkVk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01646419-7c8a-4db5-8658-08d6534b3a00 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 02:59:48.4175 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3769 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Put return value checks of calling imx6ul_opp_check_speed_grading() into one block to save one condition block for normal case. Signed-off-by: Anson Huang Acked-by: Viresh Kumar --- drivers/cpufreq/imx6q-cpufreq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index 8cb9683..9fedf62 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -405,9 +405,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) if (of_machine_is_compatible("fsl,imx6ul") || of_machine_is_compatible("fsl,imx6ull")) { ret = imx6ul_opp_check_speed_grading(cpu_dev); - if (ret == -EPROBE_DEFER) - return ret; if (ret) { + if (ret == -EPROBE_DEFER) + return ret; + dev_err(cpu_dev, "failed to read ocotp: %d\n", ret); return ret;